Support adding attributes to simd_test tests
It uses the syn crate to parse the function, so the name can now be extracted without the `find_name` helper.
This commit is contained in:
committed by
Amanieu d'Antras
parent
b8b79f2e7a
commit
41dc4aad89
@@ -11,3 +11,4 @@ test = false
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
proc-macro2 = "1.0"
|
proc-macro2 = "1.0"
|
||||||
quote = "1.0"
|
quote = "1.0"
|
||||||
|
syn = { version = "2.0", features = ["full"] }
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate quote;
|
extern crate quote;
|
||||||
|
|
||||||
use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
|
use proc_macro2::{Ident, Literal, Span, TokenStream, TokenTree};
|
||||||
use quote::ToTokens;
|
use quote::ToTokens;
|
||||||
use std::env;
|
use std::env;
|
||||||
|
|
||||||
@@ -44,13 +44,9 @@ pub fn simd_test(
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let enable_feature = string(enable_feature);
|
let enable_feature = string(enable_feature);
|
||||||
let item = TokenStream::from(item);
|
let mut item = syn::parse_macro_input!(item as syn::ItemFn);
|
||||||
let name = find_name(item.clone());
|
let item_attrs = std::mem::take(&mut item.attrs);
|
||||||
|
let name = &item.sig.ident;
|
||||||
let name: TokenStream = name
|
|
||||||
.to_string()
|
|
||||||
.parse()
|
|
||||||
.unwrap_or_else(|_| panic!("failed to parse name: {}", name.to_string()));
|
|
||||||
|
|
||||||
let target = env::var("TARGET").expect(
|
let target = env::var("TARGET").expect(
|
||||||
"TARGET environment variable should be set for rustc (e.g. TARGET=x86_64-apple-darwin cargo test)"
|
"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)]
|
#[allow(non_snake_case)]
|
||||||
#[test]
|
#[test]
|
||||||
#maybe_ignore
|
#maybe_ignore
|
||||||
|
#(#item_attrs)*
|
||||||
fn #name() {
|
fn #name() {
|
||||||
if #force_test | (#cfg_target_features) {
|
if #force_test | (#cfg_target_features) {
|
||||||
let v = unsafe { #name() };
|
let v = unsafe { #name() };
|
||||||
@@ -123,29 +120,3 @@ pub fn simd_test(
|
|||||||
};
|
};
|
||||||
ret.into()
|
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")
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user