mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove useless allocations in macro_rules follow logic.

Browse Source
This commit is contained in:
L117 2019-06-08 09:02:15 +10:00
parent d132f544f9
commit 7a74f33f90
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libsyntax/ext/tt/macro_rules.rs
View File

@ -909,7 +909,7 @@ fn check_matcher_core(sess: &ParseSess,
continue 'each_last; continue 'each_last;
} }
IsInFollow::Yes => {} IsInFollow::Yes => {}
IsInFollow::No(ref possible) => { IsInFollow::No(possible) => {
let may_be = if last.tokens.len() == 1 && let may_be = if last.tokens.len() == 1 &&
suffix_first.tokens.len() == 1 suffix_first.tokens.len() == 1
{ {
@ -933,7 +933,7 @@ fn check_matcher_core(sess: &ParseSess,
format!("not allowed after `{}` fragments", frag_spec), format!("not allowed after `{}` fragments", frag_spec),
); );
let msg = "allowed there are: "; let msg = "allowed there are: ";
match &possible[..] { match possible {
&[] => {} &[] => {}
&[t] => { &[t] => {
err.note(&format!( err.note(&format!(
@ -997,7 +997,7 @@ fn frag_can_be_followed_by_any(frag: &str) -> bool {
enum IsInFollow { enum IsInFollow {
Yes, Yes,
No(Vec<&'static str>), No(&'static [&'static str]),
Invalid(String, &'static str), Invalid(String, &'static str),
} }
@ -1029,28 +1029,28 @@ fn is_in_follow(tok: &quoted::TokenTree, frag: &str) -> IsInFollow {
IsInFollow::Yes IsInFollow::Yes
}, },
"stmt" | "expr" => { "stmt" | "expr" => {
let tokens = vec!["`=>`", "`,`", "`;`"]; const TOKENS: &[&str] = &["`=>`", "`,`", "`;`"];
match tok { match tok {
TokenTree::Token(token) => match token.kind { TokenTree::Token(token) => match token.kind {
FatArrow | Comma | Semi => IsInFollow::Yes, FatArrow | Comma | Semi => IsInFollow::Yes,
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
}, },
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
} }
}, },
"pat" => { "pat" => {
let tokens = vec!["`=>`", "`,`", "`=`", "`|`", "`if`", "`in`"]; const TOKENS: &[&str] = &["`=>`", "`,`", "`=`", "`|`", "`if`", "`in`"];
match tok { match tok {
TokenTree::Token(token) => match token.kind { TokenTree::Token(token) => match token.kind {
FatArrow | Comma | Eq | BinOp(token::Or) => IsInFollow::Yes, FatArrow | Comma | Eq | BinOp(token::Or) => IsInFollow::Yes,
Ident(name, false) if name == kw::If || name == kw::In => IsInFollow::Yes, Ident(name, false) if name == kw::If || name == kw::In => IsInFollow::Yes,
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
}, },
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
} }
}, },
"path" | "ty" => { "path" | "ty" => {
let tokens = vec![ const TOKENS: &[&str] = &[
"`{`", "`[`", "`=>`", "`,`", "`>`","`=`", "`:`", "`;`", "`|`", "`as`", "`{`", "`[`", "`=>`", "`,`", "`>`","`=`", "`:`", "`;`", "`|`", "`as`",
"`where`", "`where`",
]; ];
@ -1062,11 +1062,11 @@ fn is_in_follow(tok: &quoted::TokenTree, frag: &str) -> IsInFollow {
BinOp(token::Or) => IsInFollow::Yes, BinOp(token::Or) => IsInFollow::Yes,
Ident(name, false) if name == kw::As || Ident(name, false) if name == kw::As ||
name == kw::Where => IsInFollow::Yes, name == kw::Where => IsInFollow::Yes,
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
}, },
TokenTree::MetaVarDecl(_, _, frag) if frag.name == sym::block => TokenTree::MetaVarDecl(_, _, frag) if frag.name == sym::block =>
IsInFollow::Yes, IsInFollow::Yes,
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
} }
}, },
"ident" | "lifetime" => { "ident" | "lifetime" => {
@ -1084,7 +1084,7 @@ fn is_in_follow(tok: &quoted::TokenTree, frag: &str) -> IsInFollow {
}, },
"vis" => { "vis" => {
// Explicitly disallow `priv`, on the off chance it comes back. // Explicitly disallow `priv`, on the off chance it comes back.
let tokens = vec!["`,`", "an ident", "a type"]; const TOKENS: &[&str] = &["`,`", "an ident", "a type"];
match tok { match tok {
TokenTree::Token(token) => match token.kind { TokenTree::Token(token) => match token.kind {
Comma => IsInFollow::Yes, Comma => IsInFollow::Yes,
@ -1092,14 +1092,14 @@ fn is_in_follow(tok: &quoted::TokenTree, frag: &str) -> IsInFollow {
_ => if token.can_begin_type() { _ => if token.can_begin_type() {
IsInFollow::Yes IsInFollow::Yes
} else { } else {
IsInFollow::No(tokens) IsInFollow::No(TOKENS)
} }
}, },
TokenTree::MetaVarDecl(_, _, frag) if frag.name == sym::ident TokenTree::MetaVarDecl(_, _, frag) if frag.name == sym::ident
|| frag.name == sym::ty || frag.name == sym::ty
|| frag.name == sym::path => || frag.name == sym::path =>
IsInFollow::Yes, IsInFollow::Yes,
_ => IsInFollow::No(tokens), _ => IsInFollow::No(TOKENS),
} }
}, },
"" => IsInFollow::Yes, // kw::Invalid "" => IsInFollow::Yes, // kw::Invalid