Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rustup "Remove Spanned from {ast,hir}::FieldPat" #4395

Merged
merged 1 commit into from
Aug 16, 2019
Merged

Rustup "Remove Spanned from {ast,hir}::FieldPat" #4395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clippy_lints/src/copies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ fn bindings<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, pat: &Pat) -> FxHashMap<LocalI
},
PatKind::Struct(_, ref fields, _) => {
for pat in fields {
bindings_impl(cx, &pat.node.pat, map);
bindings_impl(cx, &pat.pat, map);
}
},
PatKind::Tuple(ref fields, _) => {
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/dbg_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ declare_lint_pass!(DbgMacro => [DBG_MACRO]);

impl EarlyLintPass for DbgMacro {
fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
if mac.node.path == sym!(dbg) {
if let Some(sugg) = tts_span(mac.node.tts.clone()).and_then(|span| snippet_opt(cx, span)) {
if mac.path == sym!(dbg) {
if let Some(sugg) = tts_span(mac.tts.clone()).and_then(|span| snippet_opt(cx, span)) {
span_lint_and_sugg(
cx,
DBG_MACRO,
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/misc_early.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ impl EarlyLintPass for MiscEarlyLints {
.name;

for field in pfields {
if let PatKind::Wild = field.node.pat.node {
if let PatKind::Wild = field.pat.node {
wilds += 1;
}
}
Expand All @@ -252,7 +252,7 @@ impl EarlyLintPass for MiscEarlyLints {
let mut normal = vec![];

for field in pfields {
match field.node.pat.node {
match field.pat.node {
PatKind::Wild => {},
_ => {
if let Ok(n) = cx.sess().source_map().span_to_snippet(field.span) {
Expand All @@ -262,7 +262,7 @@ impl EarlyLintPass for MiscEarlyLints {
}
}
for field in pfields {
if let PatKind::Wild = field.node.pat.node {
if let PatKind::Wild = field.pat.node {
wilds -= 1;
if wilds > 0 {
span_lint(
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/non_expressive_names.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for SimilarNamesNameVisitor<'a, 'tcx, 'b> {
PatKind::Ident(_, ident, _) => self.check_ident(ident),
PatKind::Struct(_, ref fields, _) => {
for field in fields {
if !field.node.is_shorthand {
self.visit_pat(&field.node.pat);
if !field.is_shorthand {
self.visit_pat(&field.pat);
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions clippy_lints/src/shadow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,20 @@ fn check_pat<'a, 'tcx>(
if let Some(init_struct) = init {
if let ExprKind::Struct(_, ref efields, _) = init_struct.node {
for field in pfields {
let name = field.node.ident.name;
let name = field.ident.name;
let efield = efields
.iter()
.find_map(|f| if f.ident.name == name { Some(&*f.expr) } else { None });
check_pat(cx, &field.node.pat, efield, span, bindings);
check_pat(cx, &field.pat, efield, span, bindings);
}
} else {
for field in pfields {
check_pat(cx, &field.node.pat, init, span, bindings);
check_pat(cx, &field.pat, init, span, bindings);
}
}
} else {
for field in pfields {
check_pat(cx, &field.node.pat, None, span, bindings);
check_pat(cx, &field.pat, None, span, bindings);
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/utils/inspector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,11 @@ fn print_pat(cx: &LateContext<'_, '_>, pat: &hir::Pat, indent: usize) {
println!("{}ignore leftover fields: {}", ind, ignore);
println!("{}fields:", ind);
for field in fields {
println!("{} field name: {}", ind, field.node.ident.name);
if field.node.is_shorthand {
println!("{} field name: {}", ind, field.ident.name);
if field.is_shorthand {
println!("{} in shorthand notation", ind);
}
print_pat(cx, &field.node.pat, indent + 1);
print_pat(cx, &field.pat, indent + 1);
}
},
hir::PatKind::TupleStruct(ref path, ref fields, opt_dots_position) => {
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ pub fn is_refutable(cx: &LateContext<'_, '_>, pat: &Pat) -> bool {
if is_enum_variant(cx, qpath, pat.hir_id) {
true
} else {
are_refutable(cx, fields.iter().map(|field| &*field.node.pat))
are_refutable(cx, fields.iter().map(|field| &*field.pat))
}
},
PatKind::TupleStruct(ref qpath, ref pats, _) => {
Expand Down
20 changes: 10 additions & 10 deletions clippy_lints/src/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ declare_lint_pass!(Write => [

impl EarlyLintPass for Write {
fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &Mac) {
if mac.node.path == sym!(println) {
if mac.path == sym!(println) {
span_lint(cx, PRINT_STDOUT, mac.span, "use of `println!`");
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, false) {
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, false) {
if fmt_str.contents.is_empty() {
span_lint_and_sugg(
cx,
Expand All @@ -198,9 +198,9 @@ impl EarlyLintPass for Write {
);
}
}
} else if mac.node.path == sym!(print) {
} else if mac.path == sym!(print) {
span_lint(cx, PRINT_STDOUT, mac.span, "use of `print!`");
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, false) {
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, false) {
if check_newlines(&fmt_str) {
span_lint_and_then(
cx,
Expand All @@ -211,7 +211,7 @@ impl EarlyLintPass for Write {
err.multipart_suggestion(
"use `println!` instead",
vec![
(mac.node.path.span, String::from("println")),
(mac.path.span, String::from("println")),
(fmt_str.newline_span(), String::new()),
],
Applicability::MachineApplicable,
Expand All @@ -220,8 +220,8 @@ impl EarlyLintPass for Write {
);
}
}
} else if mac.node.path == sym!(write) {
if let (Some(fmt_str), _) = check_tts(cx, &mac.node.tts, true) {
} else if mac.path == sym!(write) {
if let (Some(fmt_str), _) = check_tts(cx, &mac.tts, true) {
if check_newlines(&fmt_str) {
span_lint_and_then(
cx,
Expand All @@ -232,7 +232,7 @@ impl EarlyLintPass for Write {
err.multipart_suggestion(
"use `writeln!()` instead",
vec![
(mac.node.path.span, String::from("writeln")),
(mac.path.span, String::from("writeln")),
(fmt_str.newline_span(), String::new()),
],
Applicability::MachineApplicable,
Expand All @@ -241,8 +241,8 @@ impl EarlyLintPass for Write {
)
}
}
} else if mac.node.path == sym!(writeln) {
if let (Some(fmt_str), expr) = check_tts(cx, &mac.node.tts, true) {
} else if mac.path == sym!(writeln) {
if let (Some(fmt_str), expr) = check_tts(cx, &mac.tts, true) {
if fmt_str.contents.is_empty() {
let mut applicability = Applicability::MachineApplicable;
let suggestion = expr.map_or_else(
Expand Down