rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update proc macro2 (#455)

Browse Source 
* Update to proc_macro2 0.4 and related

* Update to proc_macro2 0.4 and related

* Update to proc_macro2 0.4 and related

* Add proc_macro_gen feature

* Update to the new rustfmt cli

* A few proc-macro2 stylistic updates

* Disable RUST_BACKTRACE by default

* Allow rustfmt failure for now

* Disable proc-macro2 nightly feature in verify-x86

Currently this causes bugs on nightly due to upstream rustc bugs, this should be
temporary

* Attempt to thwart mergefunc

* Use static relocation model on i686
This commit is contained in:
Luca Barbato
2018-05-21 20:37:41 +02:00
committed by Alex Crichton
parent 520805a8b6
commit 9888c6ce82
10 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/stdarch/crates/simd-test-macro/src/lib.rs
View File

@@ -12,7 +12,7 @@ extern crate quote;
use std::env;
use proc_macro2::{Literal, Span, Term, TokenStream, TokenTree};
use proc_macro2::{Literal, Span, Ident, TokenStream, TokenTree};
fn string(s: &str) -> TokenTree {
Literal::string(s).into()
@@ -29,11 +29,11 @@ pub fn simd_test(
panic!("expected #[simd_test(enable = \"feature\")]");
}
match &tokens[0] {
TokenTree::Term(tt) if tt.to_string() == "enable" => {}
TokenTree::Ident(tt) if tt.to_string() == "enable" => {}
_ => panic!("expected #[simd_test(enable = \"feature\")]"),
}
match &tokens[1] {
TokenTree::Op(tt) if tt.op() == '=' => {}
TokenTree::Punct(tt) if tt.as_char() == '=' => {}
_ => panic!("expected #[simd_test(enable = \"feature\")]"),
}
let enable_feature = match &tokens[2] {
@@ -53,9 +53,9 @@ pub fn simd_test(
let item = TokenStream::from(item);
let name = find_name(item.clone());
let name: TokenStream = name.as_str().parse().expect(&format!(
let name: TokenStream = name.to_string().parse().expect(&format!(
"failed to parse name: {}",
name.clone().as_str()
name.to_string()
));
let target = env::var("TARGET")
@@ -87,9 +87,9 @@ pub fn simd_test(
}
t => panic!("unknown target: {}", t),
};
let macro_test = proc_macro2::Term::new(macro_test, Span::call_site());
let macro_test = Ident::new(macro_test, Span::call_site());
let mut cfg_target_features = quote::Tokens::new();
let mut cfg_target_features = TokenStream::empty();
use quote::ToTokens;
for feature in target_features {
let q = quote_spanned! {
@@ -119,18 +119,18 @@ pub fn simd_test(
ret.into()
}
fn find_name(item: TokenStream) -> Term {
fn find_name(item: TokenStream) -> Ident {
let mut tokens = item.into_iter();
while let Some(tok) = tokens.next() {
if let TokenTree::Term(word) = tok {
if word.as_str() == "fn" {
if let TokenTree::Ident(word) = tok {
if word == "fn" {
break;
}
}
}
match tokens.next() {
Some(TokenTree::Term(word)) => word,
Some(TokenTree::Ident(word)) => word,
_ => panic!("failed to find function name"),
}
}