Merging upstream version 1.75.0+dfsg1.

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

2 files changed, 6 insertions, 34 deletions

diff --git a/library/stdarch/crates/simd-test-macro/Cargo.toml b/library/stdarch/crates/simd-test-macro/Cargo.toml
index cd110c1d3..c9e692d8e 100644
--- a/library/stdarch/crates/simd-test-macro/Cargo.toml
+++ b/library/stdarch/crates/simd-test-macro/Cargo.toml
@@ -11,3 +11,4 @@ test = false
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
+syn = { version = "2.0", features = ["full"] }
diff --git a/library/stdarch/crates/simd-test-macro/src/lib.rs b/library/stdarch/crates/simd-test-macro/src/lib.rs
index 2a31dd745..9e089f86b 100644
--- a/library/stdarch/crates/simd-test-macro/src/lib.rs
+++ b/library/stdarch/crates/simd-test-macro/src/lib.rs
@@ -7,7 +7,7 @@
 #[macro_use]
 extern crate quote;
 
-use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
+use proc_macro2::{Ident, Literal, Span, TokenStream, TokenTree};
 use quote::ToTokens;
 use std::env;
 
@@ -44,13 +44,9 @@ pub fn simd_test(
         .collect();
 
     let enable_feature = string(enable_feature);
-    let item = TokenStream::from(item);
-    let name = find_name(item.clone());
-
-    let name: TokenStream = name
-        .to_string()
-        .parse()
-        .unwrap_or_else(|_| panic!("failed to parse name: {}", name.to_string()));
+    let mut item = syn::parse_macro_input!(item as syn::ItemFn);
+    let item_attrs = std::mem::take(&mut item.attrs);
+    let name = &item.sig.ident;
 
     let target = env::var("TARGET").expect(
         "TARGET environment variable should be set for rustc (e.g. TARGET=x86_64-apple-darwin cargo test)"
@@ -109,6 +105,7 @@ pub fn simd_test(
         #[allow(non_snake_case)]
         #[test]
         #maybe_ignore
+        #(#item_attrs)*
         fn #name() {
             if #force_test | (#cfg_target_features) {
                 let v = unsafe { #name() };
@@ -123,29 +120,3 @@ pub fn simd_test(
     };
     ret.into()
 }
-
-fn find_name(item: TokenStream) -> Ident {
-    let mut tokens = item.into_iter();
-    while let Some(tok) = tokens.next() {
-        if let TokenTree::Ident(word) = tok {
-            if word == "fn" {
-                break;
-            }
-        }
-    }
-
-    fn get_ident(tt: TokenTree) -> Option<Ident> {
-        match tt {
-            TokenTree::Ident(i) => Some(i),
-            TokenTree::Group(g) if g.delimiter() == Delimiter::None => {
-                get_ident(g.stream().into_iter().next()?)
-            }
-            _ => None,
-        }
-    }
-
-    tokens
-        .next()
-        .and_then(get_ident)
-        .expect("failed to find function name")
-}