diff --git a/clippy_lints/src/redundant_field_names.rs b/clippy_lints/src/redundant_field_names.rs index e4d113bd3dea..885e1aa9f8d1 100644 --- a/clippy_lints/src/redundant_field_names.rs +++ b/clippy_lints/src/redundant_field_names.rs @@ -1,6 +1,6 @@ use rustc::lint::*; use rustc::hir::*; -use utils::{span_lint_and_sugg, match_var}; +use utils::{is_range_expression, match_var, span_lint_and_sugg}; /// **What it does:** Checks for fields in struct literals where shorthands /// could be used. @@ -36,10 +36,17 @@ impl LintPass for RedundantFieldNames { impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantFieldNames { fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) { - if let ExprStruct(_, ref fields, _) = expr.node { + if let ExprStruct(ref path, ref fields, _) = expr.node { for field in fields { let name = field.name.node; + // Do not care about range expressions. + // They could have redundant field name when desugared to structs. + // e.g. `start..end` is desugared to `Range { start: start, end: end }` + if is_range_expression(expr.span) { + continue; + } + if match_var(&field.expr, name) && !field.is_shorthand { span_lint_and_sugg ( cx, diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index c501dadeb793..2f2f0c04054f 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -64,6 +64,16 @@ pub fn in_macro(span: Span) -> bool { }) } +/// Returns true if `expn_info` was expanded by range expressions. +pub fn is_range_expression(span: Span) -> bool { + span.ctxt().outer().expn_info().map_or(false, |info| { + match info.callee.format { + ExpnFormat::CompilerDesugaring(CompilerDesugaringKind::DotFill) => true, + _ => false, + } + }) +} + /// Returns true if the macro that expanded the crate was outside of the /// current crate or was a /// compiler plugin. diff --git a/tests/ui/redundant_field_names.rs b/tests/ui/redundant_field_names.rs index 0eb9bef45b56..cb49283010ba 100644 --- a/tests/ui/redundant_field_names.rs +++ b/tests/ui/redundant_field_names.rs @@ -1,5 +1,8 @@ #![warn(redundant_field_names)] #![allow(unused_variables)] +#![feature(inclusive_range, inclusive_range_syntax)] + +use std::ops::{Range, RangeFrom, RangeTo, RangeInclusive, RangeToInclusive}; mod foo { pub const BAR: u8 = 0; @@ -27,4 +30,21 @@ fn main() { buzz: fizz, //should be ok foo: foo::BAR, //should be ok }; + + // Range expressions + let (start, end) = (0, 0); + + let _ = start..; + let _ = ..end; + let _ = start..end; + + let _ = ..=end; + let _ = start..=end; + + // hand-written Range family structs are linted + let _ = RangeFrom { start: start }; + let _ = RangeTo { end: end }; + let _ = Range { start: start, end: end }; + let _ = RangeInclusive { start: start, end: end }; + let _ = RangeToInclusive { end: end }; } diff --git a/tests/ui/redundant_field_names.stderr b/tests/ui/redundant_field_names.stderr index d6d752b93a35..40315c6ffac2 100644 --- a/tests/ui/redundant_field_names.stderr +++ b/tests/ui/redundant_field_names.stderr @@ -1,16 +1,58 @@ error: redundant field names in struct initialization - --> $DIR/redundant_field_names.rs:23:9 + --> $DIR/redundant_field_names.rs:26:9 | -23 | gender: gender, +26 | gender: gender, | ^^^^^^^^^^^^^^ help: replace it with: `gender` | = note: `-D redundant-field-names` implied by `-D warnings` error: redundant field names in struct initialization - --> $DIR/redundant_field_names.rs:24:9 + --> $DIR/redundant_field_names.rs:27:9 | -24 | age: age, +27 | age: age, | ^^^^^^^^ help: replace it with: `age` -error: aborting due to 2 previous errors +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:45:25 + | +45 | let _ = RangeFrom { start: start }; + | ^^^^^^^^^^^^ help: replace it with: `start` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:46:23 + | +46 | let _ = RangeTo { end: end }; + | ^^^^^^^^ help: replace it with: `end` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:47:21 + | +47 | let _ = Range { start: start, end: end }; + | ^^^^^^^^^^^^ help: replace it with: `start` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:47:35 + | +47 | let _ = Range { start: start, end: end }; + | ^^^^^^^^ help: replace it with: `end` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:48:30 + | +48 | let _ = RangeInclusive { start: start, end: end }; + | ^^^^^^^^^^^^ help: replace it with: `start` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:48:44 + | +48 | let _ = RangeInclusive { start: start, end: end }; + | ^^^^^^^^ help: replace it with: `end` + +error: redundant field names in struct initialization + --> $DIR/redundant_field_names.rs:49:32 + | +49 | let _ = RangeToInclusive { end: end }; + | ^^^^^^^^ help: replace it with: `end` + +error: aborting due to 9 previous errors