X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=clippy_lints%2Fsrc%2Fneedless_borrow.rs;h=6e18501480b6043bc5d0ebaea57fd36446db195f;hb=6d1225981177587fbb68d9c4902c770c3dbaafb0;hp=b2ac953021c4d61973e50f946b1d30d549a5cc96;hpb=374db5c0b7a8ebc92ecb35ee21e11961da6c754d;p=rust.git diff --git a/clippy_lints/src/needless_borrow.rs b/clippy_lints/src/needless_borrow.rs index b2ac953021c..6e18501480b 100644 --- a/clippy_lints/src/needless_borrow.rs +++ b/clippy_lints/src/needless_borrow.rs @@ -42,7 +42,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) { if e.span.from_expansion() || self.derived_item.is_some() { return; } - if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Immutable, ref inner) = e.kind { + if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, ref inner) = e.kind { if let ty::Ref(..) = cx.tables.expr_ty(inner).kind { for adj3 in cx.tables.expr_adjustments(e).windows(3) { if let [Adjustment { @@ -83,10 +83,10 @@ fn check_pat(&mut self, cx: &LateContext<'a, 'tcx>, pat: &'tcx Pat) { if_chain! { if let PatKind::Binding(BindingAnnotation::Ref, .., name, _) = pat.kind; if let ty::Ref(_, tam, mutbl) = cx.tables.pat_ty(pat).kind; - if mutbl == Mutability::Immutable; + if mutbl == Mutability::Not; if let ty::Ref(_, _, mutbl) = tam.kind; // only lint immutable refs, because borrowed `&mut T` cannot be moved out - if mutbl == Mutability::Immutable; + if mutbl == Mutability::Not; then { span_lint_and_then( cx, @@ -108,14 +108,14 @@ fn check_pat(&mut self, cx: &LateContext<'a, 'tcx>, pat: &'tcx Pat) { } } - fn check_item(&mut self, _: &LateContext<'a, 'tcx>, item: &'tcx Item) { + fn check_item(&mut self, _: &LateContext<'a, 'tcx>, item: &'tcx Item<'_>) { if item.attrs.iter().any(|a| a.check_name(sym!(automatically_derived))) { debug_assert!(self.derived_item.is_none()); self.derived_item = Some(item.hir_id); } } - fn check_item_post(&mut self, _: &LateContext<'a, 'tcx>, item: &'tcx Item) { + fn check_item_post(&mut self, _: &LateContext<'a, 'tcx>, item: &'tcx Item<'_>) { if let Some(id) = self.derived_item { if item.hir_id == id { self.derived_item = None;