Skip to content

Commit 464dc88

Browse files
Keith-CancelKeith-Cancel
committed
Update tests to not include unused entire 
1 parent 5228688 commit 464dc88

File tree

2 files changed

+20
-41
lines changed

2 files changed

+20
-41
lines changed

‎src/tools/rust-analyzer/crates/proc-macro-srv/src/tests/mod.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ fn test_derive_empty() {
1414
expect![[r#"
1515
IDENT 1 struct
1616
IDENT 1 S
17-
GROUP {} 1 1 1
17+
GROUP {} 1 1
1818
IDENT 1 field
1919
PUNCT 1 : [alone]
2020
PUNCT 1 & [joint]
2121
PUNCT 1 ' [joint]
2222
IDENT 1 r#lt
2323
IDENT 1 fn
24-
GROUP () 1 1 1
24+
GROUP () 1 1
2525
IDENT 1 u32
2626
PUNCT 1 - [joint]
2727
PUNCT 1 > [alone]
@@ -33,14 +33,14 @@ fn test_derive_empty() {
3333
expect![[r#"
3434
IDENT 42:Root[0000, 0]@0..6#ROOT2024 struct
3535
IDENT 42:Root[0000, 0]@7..8#ROOT2024 S
36-
GROUP {} 42:Root[0000, 0]@9..10#ROOT2024 42:Root[0000, 0]@46..47#ROOT2024 42:Root[0000, 0]@9..47#ROOT2024
36+
GROUP {} 42:Root[0000, 0]@9..10#ROOT2024 42:Root[0000, 0]@46..47#ROOT2024
3737
IDENT 42:Root[0000, 0]@11..16#ROOT2024 field
3838
PUNCT 42:Root[0000, 0]@16..17#ROOT2024 : [alone]
3939
PUNCT 42:Root[0000, 0]@18..19#ROOT2024 & [joint]
4040
PUNCT 42:Root[0000, 0]@22..23#ROOT2024 ' [joint]
4141
IDENT 42:Root[0000, 0]@22..24#ROOT2024 r#lt
4242
IDENT 42:Root[0000, 0]@25..27#ROOT2024 fn
43-
GROUP () 42:Root[0000, 0]@27..28#ROOT2024 42:Root[0000, 0]@31..32#ROOT2024 42:Root[0000, 0]@27..32#ROOT2024
43+
GROUP () 42:Root[0000, 0]@27..28#ROOT2024 42:Root[0000, 0]@31..32#ROOT2024
4444
IDENT 42:Root[0000, 0]@28..31#ROOT2024 u32
4545
PUNCT 42:Root[0000, 0]@33..34#ROOT2024 - [joint]
4646
PUNCT 42:Root[0000, 0]@34..35#ROOT2024 > [alone]
@@ -60,30 +60,30 @@ fn test_derive_error() {
6060
expect![[r#"
6161
IDENT 1 struct
6262
IDENT 1 S
63-
GROUP {} 1 1 1
63+
GROUP {} 1 1
6464
IDENT 1 field
6565
PUNCT 1 : [alone]
6666
IDENT 1 u32
6767
6868
6969
IDENT 1 compile_error
7070
PUNCT 1 ! [joint]
71-
GROUP () 1 1 1
71+
GROUP () 1 1
7272
LITER 1 Str #[derive(DeriveError)] struct S {field 58 u32 }
7373
PUNCT 1 ; [alone]
7474
"#]],
7575
expect![[r#"
7676
IDENT 42:Root[0000, 0]@0..6#ROOT2024 struct
7777
IDENT 42:Root[0000, 0]@7..8#ROOT2024 S
78-
GROUP {} 42:Root[0000, 0]@9..10#ROOT2024 42:Root[0000, 0]@22..23#ROOT2024 42:Root[0000, 0]@9..23#ROOT2024
78+
GROUP {} 42:Root[0000, 0]@9..10#ROOT2024 42:Root[0000, 0]@22..23#ROOT2024
7979
IDENT 42:Root[0000, 0]@11..16#ROOT2024 field
8080
PUNCT 42:Root[0000, 0]@16..17#ROOT2024 : [alone]
8181
IDENT 42:Root[0000, 0]@18..21#ROOT2024 u32
8282
8383
8484
IDENT 42:Root[0000, 0]@0..13#ROOT2024 compile_error
8585
PUNCT 42:Root[0000, 0]@13..14#ROOT2024 ! [joint]
86-
GROUP () 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@64..65#ROOT2024 42:Root[0000, 0]@14..65#ROOT2024
86+
GROUP () 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@64..65#ROOT2024
8787
LITER 42:Root[0000, 0]@15..64#ROOT2024 Str #[derive(DeriveError)] struct S {field 58 u32 }
8888
PUNCT 42:Root[0000, 0]@65..66#ROOT2024 ; [alone]
8989
"#]],
@@ -102,7 +102,7 @@ fn test_fn_like_macro_noop() {
102102
PUNCT 1 , [alone]
103103
LITER 1 Integer 1
104104
PUNCT 1 , [alone]
105-
GROUP [] 1 1 1
105+
GROUP [] 1 1
106106
107107
108108
IDENT 1 ident
@@ -111,7 +111,7 @@ fn test_fn_like_macro_noop() {
111111
PUNCT 1 , [alone]
112112
LITER 1 Integer 1
113113
PUNCT 1 , [alone]
114-
GROUP [] 1 1 1
114+
GROUP [] 1 1
115115
"#]],
116116
expect![[r#"
117117
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
@@ -120,7 +120,7 @@ fn test_fn_like_macro_noop() {
120120
PUNCT 42:Root[0000, 0]@8..9#ROOT2024 , [alone]
121121
LITER 42:Root[0000, 0]@10..11#ROOT2024 Integer 1
122122
PUNCT 42:Root[0000, 0]@11..12#ROOT2024 , [alone]
123-
GROUP [] 42:Root[0000, 0]@13..14#ROOT2024 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@13..15#ROOT2024
123+
GROUP [] 42:Root[0000, 0]@13..14#ROOT2024 42:Root[0000, 0]@14..15#ROOT2024
124124
125125
126126
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
@@ -129,7 +129,7 @@ fn test_fn_like_macro_noop() {
129129
PUNCT 42:Root[0000, 0]@8..9#ROOT2024 , [alone]
130130
LITER 42:Root[0000, 0]@10..11#ROOT2024 Integer 1
131131
PUNCT 42:Root[0000, 0]@11..12#ROOT2024 , [alone]
132-
GROUP [] 42:Root[0000, 0]@13..14#ROOT2024 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@13..15#ROOT2024
132+
GROUP [] 42:Root[0000, 0]@13..14#ROOT2024 42:Root[0000, 0]@14..15#ROOT2024
133133
"#]],
134134
);
135135
}
@@ -142,22 +142,22 @@ fn test_fn_like_macro_clone_ident_subtree() {
142142
expect![[r#"
143143
IDENT 1 ident
144144
PUNCT 1 , [alone]
145-
GROUP [] 1 1 1
145+
GROUP [] 1 1
146146
147147
148148
IDENT 1 ident
149149
PUNCT 1 , [alone]
150-
GROUP [] 1 1 1
150+
GROUP [] 1 1
151151
"#]],
152152
expect![[r#"
153153
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
154154
PUNCT 42:Root[0000, 0]@5..6#ROOT2024 , [alone]
155-
GROUP [] 42:Root[0000, 0]@7..8#ROOT2024 42:Root[0000, 0]@8..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024
155+
GROUP [] 42:Root[0000, 0]@7..8#ROOT2024 42:Root[0000, 0]@8..9#ROOT2024
156156
157157
158158
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
159159
PUNCT 42:Root[0000, 0]@5..6#ROOT2024 , [alone]
160-
GROUP [] 42:Root[0000, 0]@7..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024
160+
GROUP [] 42:Root[0000, 0]@7..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024
161161
"#]],
162162
);
163163
}
@@ -462,7 +462,7 @@ fn test_attr_macro() {
462462
expect![[r#"
463463
IDENT 1 mod
464464
IDENT 1 m
465-
GROUP {} 1 1 1
465+
GROUP {} 1 1
466466
467467
468468
IDENT 1 some
@@ -471,14 +471,14 @@ fn test_attr_macro() {
471471
472472
IDENT 1 compile_error
473473
PUNCT 1 ! [joint]
474-
GROUP () 1 1 1
474+
GROUP () 1 1
475475
LITER 1 Str #[attr_error(some arguments )] mod m {}
476476
PUNCT 1 ; [alone]
477477
"#]],
478478
expect![[r#"
479479
IDENT 42:Root[0000, 0]@0..3#ROOT2024 mod
480480
IDENT 42:Root[0000, 0]@4..5#ROOT2024 m
481-
GROUP {} 42:Root[0000, 0]@6..7#ROOT2024 42:Root[0000, 0]@7..8#ROOT2024 42:Root[0000, 0]@6..8#ROOT2024
481+
GROUP {} 42:Root[0000, 0]@6..7#ROOT2024 42:Root[0000, 0]@7..8#ROOT2024
482482
483483
484484
IDENT 42:Root[0000, 0]@0..4#ROOT2024 some
@@ -487,7 +487,7 @@ fn test_attr_macro() {
487487
488488
IDENT 42:Root[0000, 0]@0..13#ROOT2024 compile_error
489489
PUNCT 42:Root[0000, 0]@13..14#ROOT2024 ! [joint]
490-
GROUP () 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@56..57#ROOT2024 42:Root[0000, 0]@14..57#ROOT2024
490+
GROUP () 42:Root[0000, 0]@14..15#ROOT2024 42:Root[0000, 0]@56..57#ROOT2024
491491
LITER 42:Root[0000, 0]@15..56#ROOT2024 Str #[attr_error(some arguments )] mod m {}
492492
PUNCT 42:Root[0000, 0]@57..58#ROOT2024 ; [alone]
493493
"#]],

‎src/tools/rust-analyzer/crates/proc-macro-srv/src/token_stream.rs‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -581,27 +581,6 @@ fn debug_token_tree<S: fmt::Debug>(
581581
write!(f, "{:indent$}", "", indent = depth * 2)?;
582582
match tt {
583583
TokenTree::Group(Group { delimiter, stream, span }) => {
584-
#[cfg(bootstrap)]
585-
writeln!(
586-
f,
587-
"GROUP {}{} {:#?} {:#?} {:#?}",
588-
match delimiter {
589-
proc_macro::Delimiter::Parenthesis => "(",
590-
proc_macro::Delimiter::Brace => "{",
591-
proc_macro::Delimiter::Bracket => "[",
592-
proc_macro::Delimiter::None => "$",
593-
},
594-
match delimiter {
595-
proc_macro::Delimiter::Parenthesis => ")",
596-
proc_macro::Delimiter::Brace => "}",
597-
proc_macro::Delimiter::Bracket => "]",
598-
proc_macro::Delimiter::None => "$",
599-
},
600-
span.open,
601-
span.close,
602-
span.entire,
603-
)?;
604-
#[cfg(not(bootstrap))]
605584
writeln!(
606585
f,
607586
"GROUP {}{} {:#?} {:#?}",

0 commit comments

Comments
 (0)