get_parent_node_by_hir_id -> get_parent_node

Manishearth · Manishearth · commit c47a7e4ef2bd · 2019-06-25T14:33:51.000-07:00
diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs
@@ -115,7 +115,7 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
         let map = &self.cx.tcx.hir();
         if map.is_argument(map.hir_to_node_id(consume_pat.hir_id)) {
             // Skip closure arguments
-            if let Some(Node::Expr(..)) = map.find_by_hir_id(map.get_parent_node_by_hir_id(consume_pat.hir_id)) {
+            if let Some(Node::Expr(..)) = map.find_by_hir_id(map.get_parent_node(consume_pat.hir_id)) {
                 return;
             }
             if is_non_trait_box(cmt.ty) && !self.is_large_box(cmt.ty) {
@@ -124,7 +124,7 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
             return;
         }
         if let Categorization::Rvalue(..) = cmt.cat {
-            if let Some(Node::Stmt(st)) = map.find_by_hir_id(map.get_parent_node_by_hir_id(cmt.hir_id)) {
+            if let Some(Node::Stmt(st)) = map.find_by_hir_id(map.get_parent_node(cmt.hir_id)) {
                 if let StmtKind::Local(ref loc) = st.node {
                     if let Some(ref ex) = loc.init {
                         if let ExprKind::Box(..) = ex.node {
diff --git a/clippy_lints/src/eval_order_dependence.rs b/clippy_lints/src/eval_order_dependence.rs
@@ -176,7 +176,7 @@ fn check_for_unsequenced_reads(vis: &mut ReadVisitor<'_, '_>) {
     let map = &vis.cx.tcx.hir();
     let mut cur_id = vis.write_expr.hir_id;
     loop {
-        let parent_id = map.get_parent_node_by_hir_id(cur_id);
+        let parent_id = map.get_parent_node(cur_id);
         if parent_id == cur_id {
             break;
         }
diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs
@@ -110,7 +110,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {
         let is_impl = if let Some(hir::Node::Item(item)) = cx
             .tcx
             .hir()
-            .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))
+            .find_by_hir_id(cx.tcx.hir().get_parent_node(hir_id))
         {
             matches!(item.node, hir::ItemKind::Impl(_, _, _, _, Some(_), _, _))
         } else {
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
@@ -2218,7 +2218,7 @@ fn is_conditional(expr: &Expr) -> bool {
 fn is_nested(cx: &LateContext<'_, '_>, match_expr: &Expr, iter_expr: &Expr) -> bool {
     if_chain! {
         if let Some(loop_block) = get_enclosing_block(cx, match_expr.hir_id);
-        let parent_node = cx.tcx.hir().get_parent_node_by_hir_id(loop_block.hir_id);
+        let parent_node = cx.tcx.hir().get_parent_node(loop_block.hir_id);
         if let Some(Node::Expr(loop_expr)) = cx.tcx.hir().find_by_hir_id(parent_node);
         then {
             return is_loop_nested(cx, loop_expr, iter_expr)
@@ -2235,7 +2235,7 @@ fn is_loop_nested(cx: &LateContext<'_, '_>, loop_expr: &Expr, iter_expr: &Expr)
         return true;
     };
     loop {
-        let parent = cx.tcx.hir().get_parent_node_by_hir_id(id);
+        let parent = cx.tcx.hir().get_parent_node(id);
         if parent == id {
             return false;
         }
diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs
@@ -1423,7 +1423,7 @@ fn lint_clone_on_copy(cx: &LateContext<'_, '_>, expr: &hir::Expr, arg: &hir::Exp
             if cx.tables.expr_ty(arg) == ty {
                 snip = Some(("try removing the `clone` call", format!("{}", snippet)));
             } else {
-                let parent = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id);
+                let parent = cx.tcx.hir().get_parent_node(expr.hir_id);
                 match cx.tcx.hir().get(parent) {
                     hir::Node::Expr(parent) => match parent.node {
                         // &*x is a nop, &x.clone() is not
diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs
@@ -115,7 +115,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_id = cx.tcx.hir().get_parent_node(expr.hir_id);
     let parent_node = cx.tcx.hir().get(parent_id);
 
     if let rustc::hir::Node::Expr(e) = parent_node {
diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs
@@ -91,7 +91,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
         if let Some(Node::Item(item)) = cx
             .tcx
             .hir()
-            .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))
+            .find_by_hir_id(cx.tcx.hir().get_parent_node(hir_id))
         {
             if matches!(item.node, ItemKind::Impl(_, _, _, _, Some(_), _, _) |
                 ItemKind::Trait(..))
@@ -357,7 +357,7 @@ impl<'a, 'tcx> MovedVariablesCtxt<'a, 'tcx> {
         if let mc::Categorization::Local(vid) = cmt.cat {
             let mut id = matched_pat.hir_id;
             loop {
-                let parent = self.cx.tcx.hir().get_parent_node_by_hir_id(id);
+                let parent = self.cx.tcx.hir().get_parent_node(id);
                 if id == parent {
                     // no parent
                     return;
diff --git a/clippy_lints/src/non_copy_const.rs b/clippy_lints/src/non_copy_const.rs
@@ -169,7 +169,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonCopyConst {
 
     fn check_impl_item(&mut self, cx: &LateContext<'a, 'tcx>, impl_item: &'tcx ImplItem) {
         if let ImplItemKind::Const(hir_ty, ..) = &impl_item.node {
-            let item_hir_id = cx.tcx.hir().get_parent_node_by_hir_id(impl_item.hir_id);
+            let item_hir_id = cx.tcx.hir().get_parent_node(impl_item.hir_id);
             let item = cx.tcx.hir().expect_item(item_hir_id);
             // Ensure the impl is an inherent impl.
             if let ItemKind::Impl(_, _, _, _, None, _, _) = item.node {
@@ -204,7 +204,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonCopyConst {
             let mut dereferenced_expr = expr;
             let mut needs_check_adjustment = true;
             loop {
-                let parent_id = cx.tcx.hir().get_parent_node_by_hir_id(cur_expr.hir_id);
+                let parent_id = cx.tcx.hir().get_parent_node(cur_expr.hir_id);
                 if parent_id == cur_expr.hir_id {
                     break;
                 }
diff --git a/clippy_lints/src/suspicious_trait_impl.rs b/clippy_lints/src/suspicious_trait_impl.rs
@@ -65,7 +65,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for SuspiciousImpl {
             }
             // Check if the binary expression is part of another bi/unary expression
             // as a child node
-            let mut parent_expr = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id);
+            let mut parent_expr = cx.tcx.hir().get_parent_node(expr.hir_id);
             while parent_expr != hir::CRATE_HIR_ID {
                 if let hir::Node::Expr(e) = cx.tcx.hir().get(parent_expr) {
                     match e.node {
@@ -75,7 +75,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for SuspiciousImpl {
                         _ => {},
                     }
                 }
-                parent_expr = cx.tcx.hir().get_parent_node_by_hir_id(parent_expr);
+                parent_expr = cx.tcx.hir().get_parent_node(parent_expr);
             }
             // as a parent node
             let mut visitor = BinaryExprVisitor { in_binary_expr: false };
diff --git a/clippy_lints/src/trivially_copy_pass_by_ref.rs b/clippy_lints/src/trivially_copy_pass_by_ref.rs
@@ -182,7 +182,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TriviallyCopyPassByRef {
         if let Some(Node::Item(item)) = cx
             .tcx
             .hir()
-            .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))
+            .find_by_hir_id(cx.tcx.hir().get_parent_node(hir_id))
         {
             if matches!(item.node, ItemKind::Impl(_, _, _, _, Some(_), _, _) |
                 ItemKind::Trait(..))
diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs
@@ -585,7 +585,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnitArg {
         }
         if_chain! {
             let map = &cx.tcx.hir();
-            let opt_parent_node = map.find_by_hir_id(map.get_parent_node_by_hir_id(expr.hir_id));
+            let opt_parent_node = map.find_by_hir_id(map.get_parent_node(expr.hir_id));
             if let Some(hir::Node::Expr(parent_expr)) = opt_parent_node;
             if is_questionmark_desugar_marked_call(parent_expr);
             then {
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
@@ -592,7 +592,7 @@ fn trim_multiline_inner(s: Cow<'_, str>, ignore_first: bool, ch: char) -> Cow<'_
 pub fn get_parent_expr<'c>(cx: &'c LateContext<'_, '_>, e: &Expr) -> Option<&'c Expr> {
     let map = &cx.tcx.hir();
     let hir_id = e.hir_id;
-    let parent_id = map.get_parent_node_by_hir_id(hir_id);
+    let parent_id = map.get_parent_node(hir_id);
     if hir_id == parent_id {
         return None;
     }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ fn check_for_unsequenced_reads(vis: &mut ReadVisitor<'_, '_>) {`
`176`	`176`	`let map = &vis.cx.tcx.hir();`
`177`	`177`	`let mut cur_id = vis.write_expr.hir_id;`
`178`	`178`	`loop {`
`179`		`- let parent_id = map.get_parent_node_by_hir_id(cur_id);`
	`179`	`+ let parent_id = map.get_parent_node(cur_id);`
`180`	`180`	`if parent_id == cur_id {`
`181`	`181`	`break;`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {`
`110`	`110`	`let is_impl = if let Some(hir::Node::Item(item)) = cx`
`111`	`111`	`.tcx`
`112`	`112`	`.hir()`
`113`		`- .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))`
	`113`	`+ .find_by_hir_id(cx.tcx.hir().get_parent_node(hir_id))`
`114`	`114`	`{`
`115`	`115`	`matches!(item.node, hir::ItemKind::Impl(_, _, _, _, Some(_), _, _))`
`116`	`116`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBool {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`fn parent_node_is_if_expr<'a, 'b>(expr: &Expr, cx: &LateContext<'a, 'b>) -> bool {`
`118`		`- let parent_id = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id);`
	`118`	`+ let parent_id = cx.tcx.hir().get_parent_node(expr.hir_id);`
`119`	`119`	`let parent_node = cx.tcx.hir().get(parent_id);`
`120`	`120`
`121`	`121`	`if let rustc::hir::Node::Expr(e) = parent_node {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for SuspiciousImpl {`
`65`	`65`	`}`
`66`	`66`	`// Check if the binary expression is part of another bi/unary expression`
`67`	`67`	`// as a child node`
`68`		`- let mut parent_expr = cx.tcx.hir().get_parent_node_by_hir_id(expr.hir_id);`
	`68`	`+ let mut parent_expr = cx.tcx.hir().get_parent_node(expr.hir_id);`
`69`	`69`	`while parent_expr != hir::CRATE_HIR_ID {`
`70`	`70`	`if let hir::Node::Expr(e) = cx.tcx.hir().get(parent_expr) {`
`71`	`71`	`match e.node {`
`@@ -75,7 +75,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for SuspiciousImpl {`
`75`	`75`	`_ => {},`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- parent_expr = cx.tcx.hir().get_parent_node_by_hir_id(parent_expr);`
	`78`	`+ parent_expr = cx.tcx.hir().get_parent_node(parent_expr);`
`79`	`79`	`}`
`80`	`80`	`// as a parent node`
`81`	`81`	`let mut visitor = BinaryExprVisitor { in_binary_expr: false };`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TriviallyCopyPassByRef {`
`182`	`182`	`if let Some(Node::Item(item)) = cx`
`183`	`183`	`.tcx`
`184`	`184`	`.hir()`
`185`		`- .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))`
	`185`	`+ .find_by_hir_id(cx.tcx.hir().get_parent_node(hir_id))`
`186`	`186`	`{`
`187`	`187`	`if matches!(item.node, ItemKind::Impl(_, _, _, _, Some(_), _, _) \|`
`188`	`188`	`ItemKind::Trait(..))`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnitArg {`
`585`	`585`	`}`
`586`	`586`	`if_chain! {`
`587`	`587`	`let map = &cx.tcx.hir();`
`588`		`- let opt_parent_node = map.find_by_hir_id(map.get_parent_node_by_hir_id(expr.hir_id));`
	`588`	`+ let opt_parent_node = map.find_by_hir_id(map.get_parent_node(expr.hir_id));`
`589`	`589`	`if let Some(hir::Node::Expr(parent_expr)) = opt_parent_node;`
`590`	`590`	`if is_questionmark_desugar_marked_call(parent_expr);`
`591`	`591`	`then {`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ fn trim_multiline_inner(s: Cow<'_, str>, ignore_first: bool, ch: char) -> Cow<'_`
`592`	`592`	`pub fn get_parent_expr<'c>(cx: &'c LateContext<'_, '_>, e: &Expr) -> Option<&'c Expr> {`
`593`	`593`	`let map = &cx.tcx.hir();`
`594`	`594`	`let hir_id = e.hir_id;`
`595`		`- let parent_id = map.get_parent_node_by_hir_id(hir_id);`
	`595`	`+ let parent_id = map.get_parent_node(hir_id);`
`596`	`596`	`if hir_id == parent_id {`
`597`	`597`	`return None;`
`598`	`598`	`}`