diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index b4d2e921e050..cfe031d6cf77 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -1647,7 +1647,7 @@ fn check_for_mutability(cx: &LateContext<'_, '_>, bound: &Expr) -> Option then { let res = cx.tables.qpath_res(qpath, bound.hir_id); if let Res::Local(node_id) = res { - let node_str = cx.tcx.hir().get_by_hir_id(node_id); + let node_str = cx.tcx.hir().get(node_id); if_chain! { if let Node::Binding(pat) = node_str; if let PatKind::Binding(bind_ann, ..) = pat.node; diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index 1bcdbfec5900..304a39cfd49f 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -1424,7 +1424,7 @@ fn lint_clone_on_copy(cx: &LateContext<'_, '_>, expr: &hir::Expr, arg: &hir::Exp snip = Some(("try removing the `clone` call", format!("{}", snippet))); } else { let parent = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id); - match cx.tcx.hir().get_by_hir_id(parent) { + match cx.tcx.hir().get(parent) { hir::Node::Expr(parent) => match parent.node { // &*x is a nop, &x.clone() is not hir::ExprKind::AddrOf(..) | diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs index a9b917054830..d43eaf09be02 100644 --- a/clippy_lints/src/needless_bool.rs +++ b/clippy_lints/src/needless_bool.rs @@ -116,7 +116,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBool { fn parent_node_is_if_expr<'a, 'b>(expr: &Expr, cx: &LateContext<'a, 'b>) -> bool { let parent_id = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id); - let parent_node = cx.tcx.hir().get_by_hir_id(parent_id); + let parent_node = cx.tcx.hir().get(parent_id); if let rustc::hir::Node::Expr(e) = parent_node { if higher::if_block(&e).is_some() { diff --git a/clippy_lints/src/suspicious_trait_impl.rs b/clippy_lints/src/suspicious_trait_impl.rs index a480d98b2fd1..870805894656 100644 --- a/clippy_lints/src/suspicious_trait_impl.rs +++ b/clippy_lints/src/suspicious_trait_impl.rs @@ -67,7 +67,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for SuspiciousImpl { // as a child node let mut parent_expr = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id); while parent_expr != hir::CRATE_HIR_ID { - if let hir::Node::Expr(e) = cx.tcx.hir().get_by_hir_id(parent_expr) { + if let hir::Node::Expr(e) = cx.tcx.hir().get(parent_expr) { match e.node { hir::ExprKind::Binary(..) | hir::ExprKind::Unary(hir::UnOp::UnNot, _) diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index f8c8da0a36c2..a12225e7e484 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -66,7 +66,7 @@ pub fn differing_macro_contexts(lhs: Span, rhs: Span) -> bool { /// ``` pub fn in_constant(cx: &LateContext<'_, '_>, id: HirId) -> bool { let parent_id = cx.tcx.hir().get_parent_item(id); - match cx.tcx.hir().get_by_hir_id(parent_id) { + match cx.tcx.hir().get(parent_id) { Node::Item(&Item { node: ItemKind::Const(..), .. @@ -320,7 +320,7 @@ pub fn trait_ref_of_method<'tcx>(cx: &LateContext<'_, 'tcx>, hir_id: HirId) -> O let parent_impl = cx.tcx.hir().get_parent_item(hir_id); if_chain! { if parent_impl != hir::CRATE_HIR_ID; - if let hir::Node::Item(item) = cx.tcx.hir().get_by_hir_id(parent_impl); + if let hir::Node::Item(item) = cx.tcx.hir().get(parent_impl); if let hir::ItemKind::Impl(_, _, _, _, trait_ref, _, _) = &item.node; then { return trait_ref.as_ref(); } }