update to syn2

Cargo.toml

@@ -13,7 +13,7 @@ rust-version = "1.56.0"
 exclude = ["images/", "tests/", "miette-derive/"]
 
 [dependencies]
-thiserror = "1.0.26"
+thiserror = "1.0.40"
 miette-derive = { path = "miette-derive", version = "=5.6.0" }
 once_cell = "1.8.0"
 unicode-width = "0.1.9"
@@ -35,7 +35,7 @@ futures = { version = "0.3", default-features = false }
 indenter = "0.3.0"
 rustversion = "1.0"
 trybuild = { version = "1.0.19", features = ["diff"] }
-syn = { version = "1.0", features = ["full"] }
+syn = { version = "2.0", features = ["full"] }
 regex = "1.5"
 lazy_static = "1.4"
 

miette-derive/Cargo.toml

@@ -13,4 +13,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = "1.0.45"
+syn = "2.0.11"

miette-derive/src/diagnostic.rs

@@ -222,7 +222,7 @@ impl Diagnostic {
         let input_attrs = input
             .attrs
             .iter()
-            .filter(|x| x.path.is_ident("diagnostic"))
+            .filter(|x| x.path().is_ident("diagnostic"))
             .collect::<Vec<&syn::Attribute>>();
         Ok(match input.data {
             syn::Data::Struct(data_struct) => {
@@ -245,7 +245,7 @@ impl Diagnostic {
                 for var in variants {
                     let mut variant_attrs = input_attrs.clone();
                     variant_attrs
-                        .extend(var.attrs.iter().filter(|x| x.path.is_ident("diagnostic")));
+                        .extend(var.attrs.iter().filter(|x| x.path().is_ident("diagnostic")));
                     let args =
                         DiagnosticDefArgs::parse(&var.ident, &var.fields, &variant_attrs, true)?;
                     vars.push(DiagnosticDef {

miette-derive/src/diagnostic_source.rs

@@ -24,7 +24,7 @@ impl DiagnosticSource {
     fn from_fields_vec(fields: Vec<&syn::Field>) -> syn::Result<Option<Self>> {
         for (i, field) in fields.iter().enumerate() {
             for attr in &field.attrs {
-                if attr.path.is_ident("diagnostic_source") {
+                if attr.path().is_ident("diagnostic_source") {
                     let diagnostic_source = if let Some(ident) = field.ident.clone() {
                         syn::Member::Named(ident)
                     } else {

miette-derive/src/fmt.rs

@@ -210,21 +210,21 @@ pub fn parse_token_expr(input: ParseStream, mut begin_expr: bool) -> Result<Toke
             let delimiter = parenthesized!(content in input);
             let nested = parse_token_expr(&content, true)?;
             let mut group = Group::new(Delimiter::Parenthesis, nested);
-            group.set_span(delimiter.span);
+            group.set_span(delimiter.span.join());
             TokenTree::Group(group)
         } else if input.peek(syn::token::Brace) {
             let content;
             let delimiter = braced!(content in input);
             let nested = parse_token_expr(&content, true)?;
             let mut group = Group::new(Delimiter::Brace, nested);
-            group.set_span(delimiter.span);
+            group.set_span(delimiter.span.join());
             TokenTree::Group(group)
         } else if input.peek(syn::token::Bracket) {
             let content;
             let delimiter = bracketed!(content in input);
             let nested = parse_token_expr(&content, true)?;
             let mut group = Group::new(Delimiter::Bracket, nested);
-            group.set_span(delimiter.span);
+            group.set_span(delimiter.span.join());
             TokenTree::Group(group)
         } else {
             input.parse()?

miette-derive/src/help.rs

@@ -69,7 +69,7 @@ impl Help {
     fn from_fields_vec(fields: Vec<&syn::Field>) -> syn::Result<Option<Self>> {
         for (i, field) in fields.iter().enumerate() {
             for attr in &field.attrs {
-                if attr.path.is_ident("help") {
+                if attr.path().is_ident("help") {
                     let help = if let Some(ident) = field.ident.clone() {
                         syn::Member::Named(ident)
                     } else {

miette-derive/src/label.rs

@@ -28,6 +28,17 @@ struct LabelAttr {
 
 impl Parse for LabelAttr {
     fn parse(input: ParseStream) -> syn::Result<Self> {
+        // Skip a token.
+        // This should receive one of:
+        // - label = "..."
+        // - label("...")
+        let _ = input.step(|cursor| {
+            if let Some((_, next)) = cursor.token_tree() {
+                Ok(((), next))
+            } else {
+                Err(cursor.error("unexpected empty attribute"))
+            }
+        });
         let la = input.lookahead1();
         let label = if la.peek(syn::token::Paren) {
             // #[label("{}", x)]
@@ -79,7 +90,7 @@ impl Labels {
         let mut labels = Vec::new();
         for (i, field) in fields.iter().enumerate() {
             for attr in &field.attrs {
-                if attr.path.is_ident("label") {
+                if attr.path().is_ident("label") {
                     let span = if let Some(ident) = field.ident.clone() {
                         syn::Member::Named(ident)
                     } else {
@@ -88,7 +99,8 @@ impl Labels {
                             span: field.span(),
                         })
                     };
-                    let LabelAttr { label } = syn::parse2::<LabelAttr>(attr.tokens.clone())?;
+                    use quote::ToTokens;
+                    let LabelAttr { label } = syn::parse2::<LabelAttr>(attr.meta.to_token_stream())?;
                     labels.push(Label {
                         label,
                         span,

miette-derive/src/related.rs

@@ -24,7 +24,7 @@ impl Related {
     fn from_fields_vec(fields: Vec<&syn::Field>) -> syn::Result<Option<Self>> {
         for (i, field) in fields.iter().enumerate() {
             for attr in &field.attrs {
-                if attr.path.is_ident("related") {
+                if attr.path().is_ident("related") {
                     let related = if let Some(ident) = field.ident.clone() {
                         syn::Member::Named(ident)
                     } else {

miette-derive/src/source_code.rs

@@ -26,7 +26,7 @@ impl SourceCode {
     fn from_fields_vec(fields: Vec<&syn::Field>) -> syn::Result<Option<Self>> {
         for (i, field) in fields.iter().enumerate() {
             for attr in &field.attrs {
-                if attr.path.is_ident("source_code") {
+                if attr.path().is_ident("source_code") {
                     let source_code = if let Some(ident) = field.ident.clone() {
                         syn::Member::Named(ident)
                     } else {