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

fix bad style for structs

Browse Source
This commit is contained in:
Cedric 2019-06-08 12:18:13 +02:00
parent ad91a8e59a
commit 4123b5d796
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsyntax/diagnostics/plugin.rs
View File

@ -34,7 +34,9 @@ pub fn expand_diagnostic_used<'cx>(ecx: &'cx mut ExtCtxt<'_>,
token_tree: &[TokenTree])
-> Box<dyn MacResult+'cx> {
let code = match token_tree {
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. })] => code,
&[
TokenTree::Token(Token { kind: token::Ident(code, _), .. })
] => code,
_ => unreachable!()
};
@ -67,12 +69,16 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt<'_>,
token_tree: &[TokenTree])
-> Box<dyn MacResult+'cx> {
let (code, description) = match token_tree {
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. })] => {
&[
TokenTree::Token(Token { kind: token::Ident(code, _), .. })
] => {
(code, None)
},
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. }),
TokenTree::Token(Token { kind: token::Comma, .. }),
TokenTree::Token(Token { kind: token::Literal(token::Lit { symbol, .. }), ..})] => {
&[
TokenTree::Token(Token { kind: token::Ident(code, _), .. }),
TokenTree::Token(Token { kind: token::Comma, .. }),
TokenTree::Token(Token { kind: token::Literal(token::Lit { symbol, .. }), ..})
] => {
(code, Some(symbol))
},
_ => unreachable!()

16
src/libsyntax/parse/mod.rs
View File

@ -426,9 +426,9 @@ mod tests {
match tts {
&[
TokenTree::Token(Token {kind: token::Ident(name_macro_rules, false), ..}),
TokenTree::Token(Token {kind: token::Not, ..}),
TokenTree::Token(Token {kind: token::Ident(name_zip, false), ..}),
TokenTree::Token(Token { kind: token::Ident(name_macro_rules, false), .. }),
TokenTree::Token(Token { kind: token::Not, .. }),
TokenTree::Token(Token { kind: token::Ident(name_zip, false), .. }),
TokenTree::Delimited(_, macro_delim, ref macro_tts)
]
if name_macro_rules == sym::macro_rules && name_zip.as_str() == "zip" => {
@ -436,15 +436,15 @@ mod tests {
match tts {
&[
TokenTree::Delimited(_, first_delim, ref first_tts),
TokenTree::Token(Token {kind: token::FatArrow, ..}),
TokenTree::Token(Token { kind: token::FatArrow, .. }),
TokenTree::Delimited(_, second_delim, ref second_tts),
]
if macro_delim == token::Paren => {
let tts = &first_tts.trees().collect::<Vec<_>>();
match tts {
&[
TokenTree::Token(Token {kind: token::Dollar, ..}),
TokenTree::Token(Token {kind: token::Ident(name, false), ..}),
TokenTree::Token(Token { kind: token::Dollar, .. }),
TokenTree::Token(Token { kind: token::Ident(name, false), .. }),
]
if first_delim == token::Paren && name.as_str() == "a" => {},
_ => panic!("value 3: {:?} {:?}", first_delim, first_tts),
@ -452,8 +452,8 @@ mod tests {
let tts = &second_tts.trees().collect::<Vec<_>>();
match tts {
&[
TokenTree::Token(Token {kind: token::Dollar, ..}),
TokenTree::Token(Token {kind: token::Ident(name, false), ..}),
TokenTree::Token(Token { kind: token::Dollar, .. }),
TokenTree::Token(Token { kind: token::Ident(name, false), .. }),
]
if second_delim == token::Paren && name.as_str() == "a" => {},
_ => panic!("value 4: {:?} {:?}", second_delim, second_tts),