Auto merge of #120346 - petrochenkov:ownodes, r=oli-obk

hir: Refactor getters for owner nodes
rust-lang · Jan 31, 2024 · 9e3bb89 · 9e3bb89
2 parents f0dbf68 + 233c8c9
commit 9e3bb89
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/clippy_lints/src/methods/iter_nth_zero.rs b/clippy_lints/src/methods/iter_nth_zero.rs
@@ -11,7 +11,7 @@ use rustc_span::sym;
 use super::ITER_NTH_ZERO;
 
 pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr<'_>, arg: &hir::Expr<'_>) {
- if let OwnerNode::Item(item) = cx.tcx.hir().owner(cx.tcx.hir().get_parent_item(expr.hir_id))
+ if let OwnerNode::Item(item) = cx.tcx.hir_owner_node(cx.tcx.hir().get_parent_item(expr.hir_id))
  && let def_id = item.owner_id.to_def_id()
  && is_trait_method(cx, expr, sym::Iterator)
  && let Some(Constant::Int(0)) = constant(cx, cx.typeck_results(), arg)

diff --git a/clippy_lints/src/min_ident_chars.rs b/clippy_lints/src/min_ident_chars.rs
@@ -93,9 +93,7 @@ impl Visitor<'_> for IdentVisitor<'_, '_> {
  // reimplement it even if we wanted to
  cx.tcx.opt_hir_node(hir_id)
  } else {
- let Some(owner) = cx.tcx.hir_owner_nodes(hir_id.owner).as_owner() else {
- return;
- };
+ let owner = cx.tcx.hir_owner_nodes(hir_id.owner);
  owner.nodes.get(hir_id.local_id).copied().flatten().map(|p| p.node)
  };
  let Some(node) = node else {

diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs
@@ -183,7 +183,7 @@ impl<'tcx> LateLintPass<'tcx> for Return {
  && let ExprKind::Ret(Some(ret)) = expr.kind
  && let ExprKind::Match(.., MatchSource::TryDesugar(_)) = ret.kind
  // Ensure this is not the final stmt, otherwise removing it would cause a compile error
- && let OwnerNode::Item(item) = cx.tcx.hir().owner(cx.tcx.hir().get_parent_item(expr.hir_id))
+ && let OwnerNode::Item(item) = cx.tcx.hir_owner_node(cx.tcx.hir().get_parent_item(expr.hir_id))
  && let ItemKind::Fn(_, _, body) = item.kind
  && let block = cx.tcx.hir().body(body).value
  && let ExprKind::Block(block, _) = block.kind