diff --git a/clippy_lints/src/enum_clike.rs b/clippy_lints/src/enum_clike.rs index d2931acc538b..891cf2968b7e 100644 --- a/clippy_lints/src/enum_clike.rs +++ b/clippy_lints/src/enum_clike.rs @@ -45,7 +45,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnportableVariant { } if let ItemKind::Enum(ref def, _) = item.node { for var in &def.variants { - let variant = &var.node; + let variant = &var; if let Some(ref anon_const) = variant.disr_expr { let param_env = ty::ParamEnv::empty(); let def_id = cx.tcx.hir().body_owner_def_id(anon_const.body); diff --git a/clippy_lints/src/enum_variants.rs b/clippy_lints/src/enum_variants.rs index 1cc3bda3ba32..cf61683cb719 100644 --- a/clippy_lints/src/enum_variants.rs +++ b/clippy_lints/src/enum_variants.rs @@ -123,7 +123,7 @@ impl_lint_pass!(EnumVariantNames => [ ]); fn var2str(var: &Variant) -> LocalInternedString { - var.node.ident.as_str() + var.ident.as_str() } /// Returns the number of chars that match from the start diff --git a/clippy_lints/src/large_enum_variant.rs b/clippy_lints/src/large_enum_variant.rs index b59b58505725..2c2f4d84c73a 100644 --- a/clippy_lints/src/large_enum_variant.rs +++ b/clippy_lints/src/large_enum_variant.rs @@ -85,7 +85,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LargeEnumVariant { "large size difference between variants", |db| { if variant.fields.len() == 1 { - let span = match def.variants[i].node.data { + let span = match def.variants[i].data { VariantData::Struct(ref fields, ..) | VariantData::Tuple(ref fields, ..) => { fields[0].ty.span }, diff --git a/clippy_lints/src/missing_doc.rs b/clippy_lints/src/missing_doc.rs index 7f49a287cff3..15cbdf7180d7 100644 --- a/clippy_lints/src/missing_doc.rs +++ b/clippy_lints/src/missing_doc.rs @@ -197,6 +197,6 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc { } fn check_variant(&mut self, cx: &LateContext<'a, 'tcx>, v: &'tcx hir::Variant, _: &hir::Generics) { - self.check_missing_docs_attrs(cx, &v.node.attrs, v.span, "a variant"); + self.check_missing_docs_attrs(cx, &v.attrs, v.span, "a variant"); } } diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs index 811bdce18e89..6d9eddac8948 100644 --- a/clippy_lints/src/utils/author.rs +++ b/clippy_lints/src/utils/author.rs @@ -91,7 +91,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Author { } fn check_variant(&mut self, cx: &LateContext<'a, 'tcx>, var: &'tcx hir::Variant, generics: &hir::Generics) { - if !has_attr(cx.sess(), &var.node.attrs) { + if !has_attr(cx.sess(), &var.attrs) { return; } prelude();