Skip to content

Commit 348d398

Browse files
borsbors
committed
Auto merge of #4395 - lzutao:rustup-63586, r=phansch
Rustup "Remove `Spanned` from `{ast,hir}::FieldPat`" Rustup rust-lang/rust#63586 changelog: none
2 parents f95c87e + 65b906a commit 348d398

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎clippy_lints/src/copies.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ fn bindings<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, pat: &Pat) -> FxHashMap<LocalI
300300
},
301301
PatKind::Struct(_, ref fields, _) => {
302302
for pat in fields {
303-
bindings_impl(cx, &pat.node.pat, map);
303+
bindings_impl(cx, &pat.pat, map);
304304
}
305305
},
306306
PatKind::Tuple(ref fields, _) => {

‎clippy_lints/src/dbg_macro.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ declare_lint_pass!(DbgMacro => [DBG_MACRO]);
3131

3232
impl EarlyLintPass for DbgMacro {
3333
fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
34-
if mac.node.path == sym!(dbg) {
35-
if let Some(sugg) = tts_span(mac.node.tts.clone()).and_then(|span| snippet_opt(cx, span)) {
34+
if mac.path == sym!(dbg) {
35+
if let Some(sugg) = tts_span(mac.tts.clone()).and_then(|span| snippet_opt(cx, span)) {
3636
span_lint_and_sugg(
3737
cx,
3838
DBG_MACRO,

‎clippy_lints/src/misc_early.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl EarlyLintPass for MiscEarlyLints {
234234
.name;
235235

236236
for field in pfields {
237-
if let PatKind::Wild = field.node.pat.node {
237+
if let PatKind::Wild = field.pat.node {
238238
wilds += 1;
239239
}
240240
}
@@ -252,7 +252,7 @@ impl EarlyLintPass for MiscEarlyLints {
252252
let mut normal = vec![];
253253

254254
for field in pfields {
255-
match field.node.pat.node {
255+
match field.pat.node {
256256
PatKind::Wild => {},
257257
_ => {
258258
if let Ok(n) = cx.sess().source_map().span_to_snippet(field.span) {
@@ -262,7 +262,7 @@ impl EarlyLintPass for MiscEarlyLints {
262262
}
263263
}
264264
for field in pfields {
265-
if let PatKind::Wild = field.node.pat.node {
265+
if let PatKind::Wild = field.pat.node {
266266
wilds -= 1;
267267
if wilds > 0 {
268268
span_lint(

‎clippy_lints/src/non_expressive_names.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for SimilarNamesNameVisitor<'a, 'tcx, 'b> {
131131
PatKind::Ident(_, ident, _) => self.check_ident(ident),
132132
PatKind::Struct(_, ref fields, _) => {
133133
for field in fields {
134-
if !field.node.is_shorthand {
135-
self.visit_pat(&field.node.pat);
134+
if !field.is_shorthand {
135+
self.visit_pat(&field.pat);
136136
}
137137
}
138138
},

‎clippy_lints/src/shadow.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,20 +190,20 @@ fn check_pat<'a, 'tcx>(
190190
if let Some(init_struct) = init {
191191
if let ExprKind::Struct(_, ref efields, _) = init_struct.node {
192192
for field in pfields {
193-
let name = field.node.ident.name;
193+
let name = field.ident.name;
194194
let efield = efields
195195
.iter()
196196
.find_map(|f| if f.ident.name == name { Some(&*f.expr) } else { None });
197-
check_pat(cx, &field.node.pat, efield, span, bindings);
197+
check_pat(cx, &field.pat, efield, span, bindings);
198198
}
199199
} else {
200200
for field in pfields {
201-
check_pat(cx, &field.node.pat, init, span, bindings);
201+
check_pat(cx, &field.pat, init, span, bindings);
202202
}
203203
}
204204
} else {
205205
for field in pfields {
206-
check_pat(cx, &field.node.pat, None, span, bindings);
206+
check_pat(cx, &field.pat, None, span, bindings);
207207
}
208208
}
209209
},

‎clippy_lints/src/utils/inspector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,11 @@ fn print_pat(cx: &LateContext<'_, '_>, pat: &hir::Pat, indent: usize) {
420420
println!("{}ignore leftover fields: {}", ind, ignore);
421421
println!("{}fields:", ind);
422422
for field in fields {
423-
println!("{} field name: {}", ind, field.node.ident.name);
424-
if field.node.is_shorthand {
423+
println!("{} field name: {}", ind, field.ident.name);
424+
if field.is_shorthand {
425425
println!("{} in shorthand notation", ind);
426426
}
427-
print_pat(cx, &field.node.pat, indent + 1);
427+
print_pat(cx, &field.pat, indent + 1);
428428
}
429429
},
430430
hir::PatKind::TupleStruct(ref path, ref fields, opt_dots_position) => {

‎clippy_lints/src/utils/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ pub fn is_refutable(cx: &LateContext<'_, '_>, pat: &Pat) -> bool {
783783
if is_enum_variant(cx, qpath, pat.hir_id) {
784784
true
785785
} else {
786-
are_refutable(cx, fields.iter().map(|field| &*field.node.pat))
786+
are_refutable(cx, fields.iter().map(|field| &*field.pat))
787787
}
788788
},
789789
PatKind::TupleStruct(ref qpath, ref pats, _) => {

‎clippy_lints/src/write.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ declare_lint_pass!(Write => [
183183

184184
impl EarlyLintPass for Write {
185185
fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &Mac) {
186-
if mac.node.path == sym!(println) {
186+
if mac.path == sym!(println) {
187187
span_lint(cx, PRINT_STDOUT, mac.span, "use of `println!`");
188-
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, false) {
188+
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, false) {
189189
if fmt_str.contents.is_empty() {
190190
span_lint_and_sugg(
191191
cx,
@@ -198,9 +198,9 @@ impl EarlyLintPass for Write {
198198
);
199199
}
200200
}
201-
} else if mac.node.path == sym!(print) {
201+
} else if mac.path == sym!(print) {
202202
span_lint(cx, PRINT_STDOUT, mac.span, "use of `print!`");
203-
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, false) {
203+
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, false) {
204204
if check_newlines(&fmt_str) {
205205
span_lint_and_then(
206206
cx,
@@ -211,7 +211,7 @@ impl EarlyLintPass for Write {
211211
err.multipart_suggestion(
212212
"use `println!` instead",
213213
vec![
214-
(mac.node.path.span, String::from("println")),
214+
(mac.path.span, String::from("println")),
215215
(fmt_str.newline_span(), String::new()),
216216
],
217217
Applicability::MachineApplicable,
@@ -220,8 +220,8 @@ impl EarlyLintPass for Write {
220220
);
221221
}
222222
}
223-
} else if mac.node.path == sym!(write) {
224-
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, true) {
223+
} else if mac.path == sym!(write) {
224+
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, true) {
225225
if check_newlines(&fmt_str) {
226226
span_lint_and_then(
227227
cx,
@@ -232,7 +232,7 @@ impl EarlyLintPass for Write {
232232
err.multipart_suggestion(
233233
"use `writeln!()` instead",
234234
vec![
235-
(mac.node.path.span, String::from("writeln")),
235+
(mac.path.span, String::from("writeln")),
236236
(fmt_str.newline_span(), String::new()),
237237
],
238238
Applicability::MachineApplicable,
@@ -241,8 +241,8 @@ impl EarlyLintPass for Write {
241241
)
242242
}
243243
}
244-
} else if mac.node.path == sym!(writeln) {
245-
if let (Some(fmt_str), expr) = check_tts(cx, &mac.node.tts, true) {
244+
} else if mac.path == sym!(writeln) {
245+
if let (Some(fmt_str), expr) = check_tts(cx, &mac.tts, true) {
246246
if fmt_str.contents.is_empty() {
247247
let mut applicability = Applicability::MachineApplicable;
248248
let suggestion = expr.map_or_else(

0 commit comments

Comments
 (0)