Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 141 deletions

diff --git a/vendor/syn/tests/test_attribute.rs b/vendor/syn/tests/test_attribute.rs
index c26bd090e..597ae3adc 100644
--- a/vendor/syn/tests/test_attribute.rs
+++ b/vendor/syn/tests/test_attribute.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::uninlined_format_args)]
+
 #[macro_use]
 mod macros;
 
@@ -9,14 +11,13 @@ fn test_meta_item_word() {
     let meta = test("#[foo]");
 
     snapshot!(meta, @r###"
-    Path(Path {
+    Meta::Path {
         segments: [
             PathSegment {
                 ident: "foo",
-                arguments: None,
             },
         ],
-    })
+    }
     "###);
 }
 
@@ -30,11 +31,12 @@ fn test_meta_item_name_value() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        lit: 5,
+        value: Expr::Lit {
+            lit: 5,
+        },
     }
     "###);
 }
@@ -49,12 +51,13 @@ fn test_meta_item_bool_value() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        lit: Lit::Bool {
-            value: true,
+        value: Expr::Lit {
+            lit: Lit::Bool {
+                value: true,
+            },
         },
     }
     "###);
@@ -67,12 +70,13 @@ fn test_meta_item_bool_value() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        lit: Lit::Bool {
-            value: false,
+        value: Expr::Lit {
+            lit: Lit::Bool {
+                value: false,
+            },
         },
     }
     "###);
@@ -88,13 +92,11 @@ fn test_meta_item_list_lit() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Lit(5),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`5`),
     }
     "###);
 }
@@ -109,20 +111,11 @@ fn test_meta_item_list_word() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Meta(Path(Path {
-                segments: [
-                    PathSegment {
-                        ident: "bar",
-                        arguments: None,
-                    },
-                ],
-            })),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`bar`),
     }
     "###);
 }
@@ -137,23 +130,11 @@ fn test_meta_item_list_name_value() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Meta(Meta::NameValue {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "bar",
-                            arguments: None,
-                        },
-                    ],
-                },
-                lit: 5,
-            }),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`bar = 5`),
     }
     "###);
 }
@@ -168,25 +149,11 @@ fn test_meta_item_list_bool_value() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Meta(Meta::NameValue {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "bar",
-                            arguments: None,
-                        },
-                    ],
-                },
-                lit: Lit::Bool {
-                    value: true,
-                },
-            }),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`bar = true`),
     }
     "###);
 }
@@ -201,62 +168,11 @@ fn test_meta_item_multiple() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Meta(Path(Path {
-                segments: [
-                    PathSegment {
-                        ident: "word",
-                        arguments: None,
-                    },
-                ],
-            })),
-            Meta(Meta::NameValue {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "name",
-                            arguments: None,
-                        },
-                    ],
-                },
-                lit: 5,
-            }),
-            Meta(Meta::List {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "list",
-                            arguments: None,
-                        },
-                    ],
-                },
-                nested: [
-                    Meta(Meta::NameValue {
-                        path: Path {
-                            segments: [
-                                PathSegment {
-                                    ident: "name2",
-                                    arguments: None,
-                                },
-                            ],
-                        },
-                        lit: 6,
-                    }),
-                ],
-            }),
-            Meta(Path(Path {
-                segments: [
-                    PathSegment {
-                        ident: "word2",
-                        arguments: None,
-                    },
-                ],
-            })),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`word , name = 5 , list (name2 = 6) , word2`),
     }
     "###);
 }
@@ -271,15 +187,11 @@ fn test_bool_lit() {
             segments: [
                 PathSegment {
                     ident: "foo",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Lit(Lit::Bool {
-                value: true,
-            }),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`true`),
     }
     "###);
 }
@@ -294,34 +206,11 @@ fn test_negative_lit() {
             segments: [
                 PathSegment {
                     ident: "form",
-                    arguments: None,
                 },
             ],
         },
-        nested: [
-            Meta(Meta::NameValue {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "min",
-                            arguments: None,
-                        },
-                    ],
-                },
-                lit: -1,
-            }),
-            Meta(Meta::NameValue {
-                path: Path {
-                    segments: [
-                        PathSegment {
-                            ident: "max",
-                            arguments: None,
-                        },
-                    ],
-                },
-                lit: 200,
-            }),
-        ],
+        delimiter: MacroDelimiter::Paren,
+        tokens: TokenStream(`min = - 1 , max = 200`),
     }
     "###);
 }
@@ -332,5 +221,5 @@ fn test(input: &str) -> Meta {
     assert_eq!(attrs.len(), 1);
     let attr = attrs.into_iter().next().unwrap();
 
-    attr.parse_meta().unwrap()
+    attr.meta
 }