Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fec0479

Browse files
Aaron1011Aaron1011
committedSep 10, 2020
Fully integrate token collection for additional AST structs
This commit contains miscellaneous changes that don't fit into any of the other commits in this PR
1 parent 156ef2b commit fec0479

File tree

11 files changed

+338
-22
lines changed

11 files changed

+338
-22
lines changed
 

‎compiler/rustc_ast/src/token.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ pub enum Nonterminal {
700700

701701
// `Nonterminal` is used a lot. Make sure it doesn't unintentionally get bigger.
702702
#[cfg(target_arch = "x86_64")]
703-
rustc_data_structures::static_assert_size!(Nonterminal, 40);
703+
rustc_data_structures::static_assert_size!(Nonterminal, 48);
704704

705705
#[derive(Debug, Copy, Clone, PartialEq, Encodable, Decodable)]
706706
pub enum NonterminalKind {

‎compiler/rustc_ast_pretty/src/pprust/tests.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use super::*;
22

33
use rustc_ast as ast;
4-
use rustc_span::source_map::respan;
54
use rustc_span::symbol::Ident;
65
use rustc_span::with_default_session_globals;
76

@@ -45,7 +44,11 @@ fn test_variant_to_string() {
4544

4645
let var = ast::Variant {
4746
ident,
48-
vis: respan(rustc_span::DUMMY_SP, ast::VisibilityKind::Inherited),
47+
vis: ast::Visibility {
48+
span: rustc_span::DUMMY_SP,
49+
kind: ast::VisibilityKind::Inherited,
50+
tokens: None,
51+
},
4952
attrs: Vec::new(),
5053
id: ast::DUMMY_NODE_ID,
5154
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),

‎src/test/ui-fulldeps/pprust-expr-roundtrip.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn expr(kind: ExprKind) -> P<Expr> {
6262

6363
fn make_x() -> P<Expr> {
6464
let seg = PathSegment::from_ident(Ident::from_str("x"));
65-
let path = Path { segments: vec![seg], span: DUMMY_SP };
65+
let path = Path { segments: vec![seg], span: DUMMY_SP, tokens: None };
6666
expr(ExprKind::Path(None, path))
6767
}
6868

@@ -113,6 +113,7 @@ fn iter_exprs(depth: usize, f: &mut dyn FnMut(P<Expr>)) {
113113
id: DUMMY_NODE_ID,
114114
rules: BlockCheckMode::Default,
115115
span: DUMMY_SP,
116+
tokens: None,
116117
});
117118
iter_exprs(depth - 1, &mut |e| g(ExprKind::If(e, block.clone(), None)));
118119
},

‎src/test/ui/ast-json/ast-json-noexpand-output.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"module":{"inner":{"lo":0,"hi":0},"unsafety":"No","items":[{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null}],"inline":true},"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"crate_type","span":{"lo":0,"hi":0}},"id":0,"args":null}]},"args":{"variant":"Eq","fields":[{"lo":0,"hi":0},{"0":[[{"variant":"Token","fields":[{"kind":{"variant":"Literal","fields":[{"kind":"Str","symbol":"lib","suffix":null}]},"span":{"lo":0,"hi":0}}]},"Alone"]]}]}}]},"id":null,"style":"Inner","span":{"lo":0,"hi":0}}],"span":{"lo":0,"hi":0},"proc_macros":[]}
1+
{"module":{"inner":{"lo":0,"hi":0},"unsafety":"No","items":[{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"kind":"Inherited","span":{"lo":0,"hi":0},"tokens":null},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null}],"inline":true},"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"crate_type","span":{"lo":0,"hi":0}},"id":0,"args":null}],"tokens":null},"args":{"variant":"Eq","fields":[{"lo":0,"hi":0},{"0":[[{"variant":"Token","fields":[{"kind":{"variant":"Literal","fields":[{"kind":"Str","symbol":"lib","suffix":null}]},"span":{"lo":0,"hi":0}}]},"Alone"]]}]},"tokens":null}]},"id":null,"style":"Inner","span":{"lo":0,"hi":0}}],"span":{"lo":0,"hi":0},"proc_macros":[]}

‎src/test/ui/ast-json/ast-json-output.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"module":{"inner":{"lo":0,"hi":0},"unsafety":"No","items":[{"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"prelude_import","span":{"lo":0,"hi":0}},"id":0,"args":null}]},"args":"Empty"}]},"id":null,"style":"Outer","span":{"lo":0,"hi":0}}],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"","span":{"lo":0,"hi":0}},"kind":{"variant":"Use","fields":[{"prefix":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"{{root}}","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"std","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"prelude","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"v1","span":{"lo":0,"hi":0}},"id":0,"args":null}]},"kind":"Glob","span":{"lo":0,"hi":0}}]},"tokens":null},{"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"macro_use","span":{"lo":0,"hi":0}},"id":0,"args":null}]},"args":"Empty"}]},"id":null,"style":"Outer","span":{"lo":0,"hi":0}}],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"std","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null},{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null}],"inline":true},"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"crate_type","span":{"lo":0,"hi":0}},"id":0,"args":null}]},"args":{"variant":"Eq","fields":[{"lo":0,"hi":0},{"0":[[{"variant":"Token","fields":[{"kind":{"variant":"Literal","fields":[{"kind":"Str","symbol":"lib","suffix":null}]},"span":{"lo":0,"hi":0}}]},"Alone"]]}]}}]},"id":null,"style":"Inner","span":{"lo":0,"hi":0}}],"span":{"lo":0,"hi":0},"proc_macros":[]}
1+
{"module":{"inner":{"lo":0,"hi":0},"unsafety":"No","items":[{"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"prelude_import","span":{"lo":0,"hi":0}},"id":0,"args":null}],"tokens":null},"args":"Empty","tokens":null}]},"id":null,"style":"Outer","span":{"lo":0,"hi":0}}],"id":0,"span":{"lo":0,"hi":0},"vis":{"kind":"Inherited","span":{"lo":0,"hi":0},"tokens":null},"ident":{"name":"","span":{"lo":0,"hi":0}},"kind":{"variant":"Use","fields":[{"prefix":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"{{root}}","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"std","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"prelude","span":{"lo":0,"hi":0}},"id":0,"args":null},{"ident":{"name":"v1","span":{"lo":0,"hi":0}},"id":0,"args":null}],"tokens":null},"kind":"Glob","span":{"lo":0,"hi":0}}]},"tokens":null},{"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"macro_use","span":{"lo":0,"hi":0}},"id":0,"args":null}],"tokens":null},"args":"Empty","tokens":null}]},"id":null,"style":"Outer","span":{"lo":0,"hi":0}}],"id":0,"span":{"lo":0,"hi":0},"vis":{"kind":"Inherited","span":{"lo":0,"hi":0},"tokens":null},"ident":{"name":"std","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null},{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"kind":"Inherited","span":{"lo":0,"hi":0},"tokens":null},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":null}],"inline":true},"attrs":[{"kind":{"variant":"Normal","fields":[{"path":{"span":{"lo":0,"hi":0},"segments":[{"ident":{"name":"crate_type","span":{"lo":0,"hi":0}},"id":0,"args":null}],"tokens":null},"args":{"variant":"Eq","fields":[{"lo":0,"hi":0},{"0":[[{"variant":"Token","fields":[{"kind":{"variant":"Literal","fields":[{"kind":"Str","symbol":"lib","suffix":null}]},"span":{"lo":0,"hi":0}}]},"Alone"]]}]},"tokens":null}]},"id":null,"style":"Inner","span":{"lo":0,"hi":0}}],"span":{"lo":0,"hi":0},"proc_macros":[]}

‎src/test/ui/proc-macro/capture-macro-rules-invoke.rs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
// aux-build:test-macros.rs
22
// check-pass
33
// compile-flags: -Z span-debug
4-
// normalize-stdout-test "#\d+" -> "#CTXT"
4+
5+
#![no_std] // Don't load unnecessary hygiene information from std
6+
extern crate std;
57

68
extern crate test_macros;
7-
use test_macros::print_bang;
9+
use test_macros::{print_bang, print_bang_consume};
10+
11+
macro_rules! test_matchers {
12+
($expr:expr, $block:block, $stmt:stmt, $ty:ty, $ident:ident, $lifetime:lifetime,
13+
$meta:meta, $path:path, $vis:vis, $tt:tt, $lit:literal) => {
14+
print_bang_consume!($expr, $block, $stmt, $ty, $ident,
15+
$lifetime, $meta, $path, $vis, $tt, $lit)
16+
}
17+
}
818

919
macro_rules! use_expr {
1020
($expr:expr) => {
@@ -24,10 +34,23 @@ impl Foo {
2434
#[allow(dead_code)]
2535
fn use_self(self) {
2636
drop(use_expr!(self));
37+
test_matchers!(
38+
1 + 1,
39+
{ "a" },
40+
let a = 1,
41+
String,
42+
my_name,
43+
'a,
44+
my_val = 30,
45+
std::option::Option,
46+
pub(in some::path),
47+
[ a b c ],
48+
-30
49+
);
2750
}
2851

2952
fn with_pat(use_pat!((a, b)): (u32, u32)) {
30-
println!("Args: {} {}", a, b);
53+
let _ = (a, b);
3154
}
3255
}
3356

‎src/test/ui/proc-macro/capture-macro-rules-invoke.stdout

Lines changed: 296 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,299 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
55
stream: TokenStream [
66
Ident {
77
ident: "self",
8-
span: $DIR/capture-macro-rules-invoke.rs:26:24: 26:28 (#CTXT),
8+
span: $DIR/capture-macro-rules-invoke.rs:36:24: 36:28 (#0),
99
},
1010
],
11-
span: $DIR/capture-macro-rules-invoke.rs:11:21: 11:26 (#CTXT),
11+
span: $DIR/capture-macro-rules-invoke.rs:21:21: 21:26 (#3),
12+
},
13+
]
14+
PRINT-BANG INPUT (DISPLAY): 1 + 1, { "a" }, let a = 1;, String, my_name, 'a, my_val = 30,
15+
std::option::Option, pub(in some::path) , [a b c], -30
16+
PRINT-BANG RE-COLLECTED (DISPLAY): 1 + 1, { "a" }, let a = 1, String, my_name, 'a, my_val = 30,
17+
std :: option :: Option, pub(in some :: path), [a b c], - 30
18+
PRINT-BANG INPUT (DEBUG): TokenStream [
19+
Group {
20+
delimiter: None,
21+
stream: TokenStream [
22+
Literal {
23+
kind: Integer,
24+
symbol: "1",
25+
suffix: None,
26+
span: $DIR/capture-macro-rules-invoke.rs:38:13: 38:14 (#0),
27+
},
28+
Punct {
29+
ch: '+',
30+
spacing: Alone,
31+
span: $DIR/capture-macro-rules-invoke.rs:38:15: 38:16 (#0),
32+
},
33+
Literal {
34+
kind: Integer,
35+
symbol: "1",
36+
suffix: None,
37+
span: $DIR/capture-macro-rules-invoke.rs:38:17: 38:18 (#0),
38+
},
39+
],
40+
span: $DIR/capture-macro-rules-invoke.rs:14:29: 14:34 (#7),
41+
},
42+
Punct {
43+
ch: ',',
44+
spacing: Alone,
45+
span: $DIR/capture-macro-rules-invoke.rs:14:34: 14:35 (#7),
46+
},
47+
Group {
48+
delimiter: None,
49+
stream: TokenStream [
50+
Group {
51+
delimiter: Brace,
52+
stream: TokenStream [
53+
Literal {
54+
kind: Str,
55+
symbol: "a",
56+
suffix: None,
57+
span: $DIR/capture-macro-rules-invoke.rs:39:15: 39:18 (#0),
58+
},
59+
],
60+
span: $DIR/capture-macro-rules-invoke.rs:39:13: 39:20 (#0),
61+
},
62+
],
63+
span: $DIR/capture-macro-rules-invoke.rs:14:36: 14:42 (#7),
64+
},
65+
Punct {
66+
ch: ',',
67+
spacing: Alone,
68+
span: $DIR/capture-macro-rules-invoke.rs:14:42: 14:43 (#7),
69+
},
70+
Group {
71+
delimiter: None,
72+
stream: TokenStream [
73+
Ident {
74+
ident: "let",
75+
span: $DIR/capture-macro-rules-invoke.rs:40:13: 40:16 (#0),
76+
},
77+
Ident {
78+
ident: "a",
79+
span: $DIR/capture-macro-rules-invoke.rs:40:17: 40:18 (#0),
80+
},
81+
Punct {
82+
ch: '=',
83+
spacing: Alone,
84+
span: $DIR/capture-macro-rules-invoke.rs:40:19: 40:20 (#0),
85+
},
86+
Literal {
87+
kind: Integer,
88+
symbol: "1",
89+
suffix: None,
90+
span: $DIR/capture-macro-rules-invoke.rs:40:21: 40:22 (#0),
91+
},
92+
],
93+
span: $DIR/capture-macro-rules-invoke.rs:14:44: 14:49 (#7),
94+
},
95+
Punct {
96+
ch: ',',
97+
spacing: Alone,
98+
span: $DIR/capture-macro-rules-invoke.rs:14:49: 14:50 (#7),
99+
},
100+
Group {
101+
delimiter: None,
102+
stream: TokenStream [
103+
Ident {
104+
ident: "String",
105+
span: $DIR/capture-macro-rules-invoke.rs:41:13: 41:19 (#0),
106+
},
107+
],
108+
span: $DIR/capture-macro-rules-invoke.rs:14:51: 14:54 (#7),
109+
},
110+
Punct {
111+
ch: ',',
112+
spacing: Alone,
113+
span: $DIR/capture-macro-rules-invoke.rs:14:54: 14:55 (#7),
114+
},
115+
Group {
116+
delimiter: None,
117+
stream: TokenStream [
118+
Ident {
119+
ident: "my_name",
120+
span: $DIR/capture-macro-rules-invoke.rs:42:13: 42:20 (#0),
121+
},
122+
],
123+
span: $DIR/capture-macro-rules-invoke.rs:14:56: 14:62 (#7),
124+
},
125+
Punct {
126+
ch: ',',
127+
spacing: Alone,
128+
span: $DIR/capture-macro-rules-invoke.rs:14:62: 14:63 (#7),
129+
},
130+
Group {
131+
delimiter: None,
132+
stream: TokenStream [
133+
Punct {
134+
ch: '\'',
135+
spacing: Joint,
136+
span: $DIR/capture-macro-rules-invoke.rs:43:13: 43:15 (#0),
137+
},
138+
Ident {
139+
ident: "a",
140+
span: $DIR/capture-macro-rules-invoke.rs:43:13: 43:15 (#0),
141+
},
142+
],
143+
span: $DIR/capture-macro-rules-invoke.rs:15:29: 15:38 (#7),
144+
},
145+
Punct {
146+
ch: ',',
147+
spacing: Alone,
148+
span: $DIR/capture-macro-rules-invoke.rs:15:38: 15:39 (#7),
149+
},
150+
Group {
151+
delimiter: None,
152+
stream: TokenStream [
153+
Ident {
154+
ident: "my_val",
155+
span: $DIR/capture-macro-rules-invoke.rs:44:13: 44:19 (#0),
156+
},
157+
Punct {
158+
ch: '=',
159+
spacing: Alone,
160+
span: $DIR/capture-macro-rules-invoke.rs:44:20: 44:21 (#0),
161+
},
162+
Literal {
163+
kind: Integer,
164+
symbol: "30",
165+
suffix: None,
166+
span: $DIR/capture-macro-rules-invoke.rs:44:22: 44:24 (#0),
167+
},
168+
],
169+
span: $DIR/capture-macro-rules-invoke.rs:15:40: 15:45 (#7),
170+
},
171+
Punct {
172+
ch: ',',
173+
spacing: Alone,
174+
span: $DIR/capture-macro-rules-invoke.rs:15:45: 15:46 (#7),
175+
},
176+
Group {
177+
delimiter: None,
178+
stream: TokenStream [
179+
Ident {
180+
ident: "std",
181+
span: $DIR/capture-macro-rules-invoke.rs:45:13: 45:16 (#0),
182+
},
183+
Punct {
184+
ch: ':',
185+
spacing: Joint,
186+
span: $DIR/capture-macro-rules-invoke.rs:45:16: 45:18 (#0),
187+
},
188+
Punct {
189+
ch: ':',
190+
spacing: Alone,
191+
span: $DIR/capture-macro-rules-invoke.rs:45:16: 45:18 (#0),
192+
},
193+
Ident {
194+
ident: "option",
195+
span: $DIR/capture-macro-rules-invoke.rs:45:18: 45:24 (#0),
196+
},
197+
Punct {
198+
ch: ':',
199+
spacing: Joint,
200+
span: $DIR/capture-macro-rules-invoke.rs:45:24: 45:26 (#0),
201+
},
202+
Punct {
203+
ch: ':',
204+
spacing: Alone,
205+
span: $DIR/capture-macro-rules-invoke.rs:45:24: 45:26 (#0),
206+
},
207+
Ident {
208+
ident: "Option",
209+
span: $DIR/capture-macro-rules-invoke.rs:45:26: 45:32 (#0),
210+
},
211+
],
212+
span: $DIR/capture-macro-rules-invoke.rs:15:47: 15:52 (#7),
213+
},
214+
Punct {
215+
ch: ',',
216+
spacing: Alone,
217+
span: $DIR/capture-macro-rules-invoke.rs:15:52: 15:53 (#7),
218+
},
219+
Group {
220+
delimiter: None,
221+
stream: TokenStream [
222+
Ident {
223+
ident: "pub",
224+
span: $DIR/capture-macro-rules-invoke.rs:46:13: 46:16 (#0),
225+
},
226+
Group {
227+
delimiter: Parenthesis,
228+
stream: TokenStream [
229+
Ident {
230+
ident: "in",
231+
span: $DIR/capture-macro-rules-invoke.rs:46:17: 46:19 (#0),
232+
},
233+
Ident {
234+
ident: "some",
235+
span: $DIR/capture-macro-rules-invoke.rs:46:20: 46:24 (#0),
236+
},
237+
Punct {
238+
ch: ':',
239+
spacing: Joint,
240+
span: $DIR/capture-macro-rules-invoke.rs:46:24: 46:26 (#0),
241+
},
242+
Punct {
243+
ch: ':',
244+
spacing: Alone,
245+
span: $DIR/capture-macro-rules-invoke.rs:46:24: 46:26 (#0),
246+
},
247+
Ident {
248+
ident: "path",
249+
span: $DIR/capture-macro-rules-invoke.rs:46:26: 46:30 (#0),
250+
},
251+
],
252+
span: $DIR/capture-macro-rules-invoke.rs:46:16: 46:31 (#0),
253+
},
254+
],
255+
span: $DIR/capture-macro-rules-invoke.rs:15:54: 15:58 (#7),
256+
},
257+
Punct {
258+
ch: ',',
259+
spacing: Alone,
260+
span: $DIR/capture-macro-rules-invoke.rs:15:58: 15:59 (#7),
261+
},
262+
Group {
263+
delimiter: Bracket,
264+
stream: TokenStream [
265+
Ident {
266+
ident: "a",
267+
span: $DIR/capture-macro-rules-invoke.rs:47:15: 47:16 (#0),
268+
},
269+
Ident {
270+
ident: "b",
271+
span: $DIR/capture-macro-rules-invoke.rs:47:17: 47:18 (#0),
272+
},
273+
Ident {
274+
ident: "c",
275+
span: $DIR/capture-macro-rules-invoke.rs:47:19: 47:20 (#0),
276+
},
277+
],
278+
span: $DIR/capture-macro-rules-invoke.rs:47:13: 47:22 (#0),
279+
},
280+
Punct {
281+
ch: ',',
282+
spacing: Alone,
283+
span: $DIR/capture-macro-rules-invoke.rs:15:63: 15:64 (#7),
284+
},
285+
Group {
286+
delimiter: None,
287+
stream: TokenStream [
288+
Punct {
289+
ch: '-',
290+
spacing: Alone,
291+
span: $DIR/capture-macro-rules-invoke.rs:48:13: 48:14 (#0),
292+
},
293+
Literal {
294+
kind: Integer,
295+
symbol: "30",
296+
suffix: None,
297+
span: $DIR/capture-macro-rules-invoke.rs:48:14: 48:16 (#0),
298+
},
299+
],
300+
span: $DIR/capture-macro-rules-invoke.rs:15:65: 15:69 (#7),
12301
},
13302
]
14303
PRINT-BANG INPUT (DISPLAY): (a, b)
@@ -21,21 +310,21 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
21310
stream: TokenStream [
22311
Ident {
23312
ident: "a",
24-
span: $DIR/capture-macro-rules-invoke.rs:29:27: 29:28 (#CTXT),
313+
span: $DIR/capture-macro-rules-invoke.rs:52:27: 52:28 (#0),
25314
},
26315
Punct {
27316
ch: ',',
28317
spacing: Alone,
29-
span: $DIR/capture-macro-rules-invoke.rs:29:28: 29:29 (#CTXT),
318+
span: $DIR/capture-macro-rules-invoke.rs:52:28: 52:29 (#0),
30319
},
31320
Ident {
32321
ident: "b",
33-
span: $DIR/capture-macro-rules-invoke.rs:29:30: 29:31 (#CTXT),
322+
span: $DIR/capture-macro-rules-invoke.rs:52:30: 52:31 (#0),
34323
},
35324
],
36-
span: $DIR/capture-macro-rules-invoke.rs:29:26: 29:32 (#CTXT),
325+
span: $DIR/capture-macro-rules-invoke.rs:52:26: 52:32 (#0),
37326
},
38327
],
39-
span: $DIR/capture-macro-rules-invoke.rs:17:21: 17:25 (#CTXT),
328+
span: $DIR/capture-macro-rules-invoke.rs:27:21: 27:25 (#11),
40329
},
41330
]

‎src/tools/clippy/clippy_lints/src/enum_variants.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ impl EarlyLintPass for EnumVariantNames {
285285
);
286286
}
287287
}
288-
if item.vis.node.is_pub() {
288+
if item.vis.kind.is_pub() {
289289
let matching = partial_match(mod_camel, &item_camel);
290290
let rmatching = partial_rmatch(mod_camel, &item_camel);
291291
let nchars = mod_camel.chars().count();
@@ -316,7 +316,7 @@ impl EarlyLintPass for EnumVariantNames {
316316
}
317317
}
318318
if let ItemKind::Enum(ref def, _) = item.kind {
319-
let lint = match item.vis.node {
319+
let lint = match item.vis.kind {
320320
VisibilityKind::Public => PUB_ENUM_VARIANT_NAMES,
321321
_ => ENUM_VARIANT_NAMES,
322322
};

‎src/tools/clippy/clippy_lints/src/manual_non_exhaustive.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fn check_manual_non_exhaustive_enum(cx: &EarlyContext<'_>, item: &Item, variants
122122

123123
fn check_manual_non_exhaustive_struct(cx: &EarlyContext<'_>, item: &Item, data: &VariantData) {
124124
fn is_private(field: &StructField) -> bool {
125-
matches!(field.vis.node, VisibilityKind::Inherited)
125+
matches!(field.vis.kind, VisibilityKind::Inherited)
126126
}
127127

128128
fn is_non_exhaustive_marker(field: &StructField) -> bool {
@@ -141,7 +141,7 @@ fn check_manual_non_exhaustive_struct(cx: &EarlyContext<'_>, item: &Item, data:
141141

142142
let fields = data.fields();
143143
let private_fields = fields.iter().filter(|f| is_private(f)).count();
144-
let public_fields = fields.iter().filter(|f| f.vis.node.is_pub()).count();
144+
let public_fields = fields.iter().filter(|f| f.vis.kind.is_pub()).count();
145145

146146
if_chain! {
147147
if private_fields == 1 && public_fields >= 1 && public_fields == fields.len() - 1;

‎src/tools/clippy/clippy_lints/src/single_component_path_imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl EarlyLintPass for SingleComponentPathImports {
4141
if_chain! {
4242
if !in_macro(item.span);
4343
if cx.sess.opts.edition == Edition::Edition2018;
44-
if !item.vis.node.is_pub();
44+
if !item.vis.kind.is_pub();
4545
if let ItemKind::Use(use_tree) = &item.kind;
4646
if let segments = &use_tree.prefix.segments;
4747
if segments.len() == 1;

‎src/tools/clippy/clippy_lints/src/utils/ast_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ pub fn eq_defaultness(l: Defaultness, r: Defaultness) -> bool {
392392

393393
pub fn eq_vis(l: &Visibility, r: &Visibility) -> bool {
394394
use VisibilityKind::*;
395-
match (&l.node, &r.node) {
395+
match (&l.kind, &r.kind) {
396396
(Public, Public) | (Inherited, Inherited) | (Crate(_), Crate(_)) => true,
397397
(Restricted { path: l, .. }, Restricted { path: r, .. }) => eq_path(l, r),
398398
_ => false,

0 commit comments

Comments
 (0)
Please sign in to comment.