diff options
| author | Cedric <cedric.brancourt@gmail.com> | 2019-06-08 12:18:13 +0200 |
|---|---|---|
| committer | Cedric <cedric.brancourt@gmail.com> | 2019-06-08 12:18:13 +0200 |
| commit | 4123b5d796345bb01f0f40b2e28e6c194371fabe (patch) | |
| tree | fd70212b1e3f20130662bc7a8be714f02343343b | |
| parent | ad91a8e59abca232a3e4449186712c032ab12519 (diff) | |
| download | rust-4123b5d796345bb01f0f40b2e28e6c194371fabe.tar.gz rust-4123b5d796345bb01f0f40b2e28e6c194371fabe.zip | |
fix bad style for structs
| -rw-r--r-- | src/libsyntax/diagnostics/plugin.rs | 16 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 16 |
2 files changed, 19 insertions, 13 deletions
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs index b958a760e82..b4cf24f5ac5 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.rs @@ -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!() diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 72573af9c40..025972d8ca7 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -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), |
