Skip to content

Commit 4123b5d

Browse files
fix bad style for structs
1 parent ad91a8e commit 4123b5d

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

src/libsyntax/diagnostics/plugin.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ pub fn expand_diagnostic_used<'cx>(ecx: &'cx mut ExtCtxt<'_>,
3434
token_tree: &[TokenTree])
3535
-> Box<dyn MacResult+'cx> {
3636
let code = match token_tree {
37-
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. })] => code,
37+
&[
38+
TokenTree::Token(Token { kind: token::Ident(code, _), .. })
39+
] => code,
3840
_ => unreachable!()
3941
};
4042

@@ -67,12 +69,16 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt<'_>,
6769
token_tree: &[TokenTree])
6870
-> Box<dyn MacResult+'cx> {
6971
let (code, description) = match token_tree {
70-
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. })] => {
72+
&[
73+
TokenTree::Token(Token { kind: token::Ident(code, _), .. })
74+
] => {
7175
(code, None)
7276
},
73-
&[TokenTree::Token(Token { kind: token::Ident(code, _), .. }),
74-
TokenTree::Token(Token { kind: token::Comma, .. }),
75-
TokenTree::Token(Token { kind: token::Literal(token::Lit { symbol, .. }), ..})] => {
77+
&[
78+
TokenTree::Token(Token { kind: token::Ident(code, _), .. }),
79+
TokenTree::Token(Token { kind: token::Comma, .. }),
80+
TokenTree::Token(Token { kind: token::Literal(token::Lit { symbol, .. }), ..})
81+
] => {
7682
(code, Some(symbol))
7783
},
7884
_ => unreachable!()

src/libsyntax/parse/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -426,34 +426,34 @@ mod tests {
426426

427427
match tts {
428428
&[
429-
TokenTree::Token(Token {kind: token::Ident(name_macro_rules, false), ..}),
430-
TokenTree::Token(Token {kind: token::Not, ..}),
431-
TokenTree::Token(Token {kind: token::Ident(name_zip, false), ..}),
429+
TokenTree::Token(Token { kind: token::Ident(name_macro_rules, false), .. }),
430+
TokenTree::Token(Token { kind: token::Not, .. }),
431+
TokenTree::Token(Token { kind: token::Ident(name_zip, false), .. }),
432432
TokenTree::Delimited(_, macro_delim, ref macro_tts)
433433
]
434434
if name_macro_rules == sym::macro_rules && name_zip.as_str() == "zip" => {
435435
let tts = &macro_tts.trees().collect::<Vec<_>>();
436436
match tts {
437437
&[
438438
TokenTree::Delimited(_, first_delim, ref first_tts),
439-
TokenTree::Token(Token {kind: token::FatArrow, ..}),
439+
TokenTree::Token(Token { kind: token::FatArrow, .. }),
440440
TokenTree::Delimited(_, second_delim, ref second_tts),
441441
]
442442
if macro_delim == token::Paren => {
443443
let tts = &first_tts.trees().collect::<Vec<_>>();
444444
match tts {
445445
&[
446-
TokenTree::Token(Token {kind: token::Dollar, ..}),
447-
TokenTree::Token(Token {kind: token::Ident(name, false), ..}),
446+
TokenTree::Token(Token { kind: token::Dollar, .. }),
447+
TokenTree::Token(Token { kind: token::Ident(name, false), .. }),
448448
]
449449
if first_delim == token::Paren && name.as_str() == "a" => {},
450450
_ => panic!("value 3: {:?} {:?}", first_delim, first_tts),
451451
}
452452
let tts = &second_tts.trees().collect::<Vec<_>>();
453453
match tts {
454454
&[
455-
TokenTree::Token(Token {kind: token::Dollar, ..}),
456-
TokenTree::Token(Token {kind: token::Ident(name, false), ..}),
455+
TokenTree::Token(Token { kind: token::Dollar, .. }),
456+
TokenTree::Token(Token { kind: token::Ident(name, false), .. }),
457457
]
458458
if second_delim == token::Paren && name.as_str() == "a" => {},
459459
_ => panic!("value 4: {:?} {:?}", second_delim, second_tts),

0 commit comments

Comments
 (0)