diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 0619b12cddd..e7a8006e5ab 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -377,11 +377,9 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) { reg.register_late_lint_pass(box large_enum_variant::LargeEnumVariant::new(conf.enum_variant_size_threshold)); reg.register_late_lint_pass(box explicit_write::Pass); reg.register_late_lint_pass(box needless_pass_by_value::NeedlessPassByValue); - - let target = ®.sess.target; reg.register_late_lint_pass(box trivially_copy_pass_by_ref::TriviallyCopyPassByRef::new( conf.trivial_copy_size_limit, - target, + ®.sess.target, )); reg.register_early_lint_pass(box literal_representation::LiteralDigitGrouping); reg.register_early_lint_pass(box literal_representation::LiteralRepresentation::new( diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs index 939b4f595e4..f8e99480ea0 100644 --- a/clippy_lints/src/utils/hir_utils.rs +++ b/clippy_lints/src/utils/hir_utils.rs @@ -454,8 +454,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> { CaptureClause::CaptureByValue => 0, CaptureClause::CaptureByRef => 1, }.hash(&mut self.s); - let value = &self.cx.tcx.hir.body(eid).value; - self.hash_expr(value); + self.hash_expr(&self.cx.tcx.hir.body(eid).value); }, ExprKind::Field(ref e, ref f) => { let c: fn(_, _) -> _ = ExprKind::Field; @@ -522,8 +521,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> { self.hash_expr(e); let full_table = self.tables; self.tables = self.cx.tcx.body_tables(l_id.body); - let value = &self.cx.tcx.hir.body(l_id.body).value; - self.hash_expr(value); + self.hash_expr(&self.cx.tcx.hir.body(l_id.body).value); self.tables = full_table; }, ExprKind::Ret(ref e) => {