rustc: hir().local_def_id_to_hir_id() -> tcx.local_def_id_to_hir_id() cleanup

Author: petrochenkov

clippy_lints/src/derive.rs

@@ -255,7 +255,7 @@ fn check_hash_peq<'tcx>(
  "you are deriving `Hash` but have implemented `PartialEq` explicitly",
  |diag| {
  if let Some(local_def_id) = impl_id.as_local() {
- let hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id);
+ let hir_id = cx.tcx.local_def_id_to_hir_id(local_def_id);
  diag.span_note(cx.tcx.hir().span(hir_id), "`PartialEq` implemented here");
  }
  },
@@ -299,7 +299,7 @@ fn check_ord_partial_ord<'tcx>(
 
  span_lint_and_then(cx, DERIVE_ORD_XOR_PARTIAL_ORD, span, mess, |diag| {
  if let Some(local_def_id) = impl_id.as_local() {
- let hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id);
+ let hir_id = cx.tcx.local_def_id_to_hir_id(local_def_id);
  diag.span_note(cx.tcx.hir().span(hir_id), "`PartialOrd` implemented here");
  }
  });
@@ -381,7 +381,7 @@ fn check_unsafe_derive_deserialize<'tcx>(
  && match_def_path(cx, trait_def_id, &paths::SERDE_DESERIALIZE)
  && let ty::Adt(def, _) = ty.kind()
  && let Some(local_def_id) = def.did().as_local()
- && let adt_hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id)
+ && let adt_hir_id = cx.tcx.local_def_id_to_hir_id(local_def_id)
  && !is_lint_allowed(cx, UNSAFE_DERIVE_DESERIALIZE, adt_hir_id)
  && cx
  .tcx

clippy_lints/src/error_impl_error.rs

@@ -58,7 +58,7 @@ impl<'tcx> LateLintPass<'tcx> for ErrorImplError {
  if let Some(trait_def_id) = imp.of_trait.and_then(|t| t.trait_def_id())
  && error_def_id == trait_def_id
  && let Some(def_id) = path_res(cx, imp.self_ty).opt_def_id().and_then(DefId::as_local)
- && let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id)
+ && let hir_id = cx.tcx.local_def_id_to_hir_id(def_id)
  && let Some(ident) = cx.tcx.opt_item_ident(def_id.to_def_id())
  && ident.name == sym::Error
  && is_visible_outside_module(cx, def_id) =>

clippy_lints/src/escape.rs

@@ -74,7 +74,7 @@ impl<'tcx> LateLintPass<'tcx> for BoxedLocal {
  let parent_id = cx
  .tcx
  .hir()
- .get_parent_item(cx.tcx.hir().local_def_id_to_hir_id(fn_def_id))
+ .get_parent_item(cx.tcx.local_def_id_to_hir_id(fn_def_id))
  .def_id;
  let parent_node = cx.tcx.hir().find_by_def_id(parent_id);
 

clippy_lints/src/excessive_bools.rs

@@ -171,7 +171,7 @@ impl<'tcx> LateLintPass<'tcx> for ExcessiveBools {
  span: Span,
  def_id: LocalDefId,
  ) {
- let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
+ let hir_id = cx.tcx.local_def_id_to_hir_id(def_id);
  if let Some(fn_header) = fn_kind.header()
  && fn_header.abi == Abi::Rust
  && get_parent_as_impl(cx.tcx, hir_id).map_or(true, |impl_item| impl_item.of_trait.is_none())

clippy_lints/src/functions/mod.rs

@@ -407,7 +407,7 @@ impl<'tcx> LateLintPass<'tcx> for Functions {
  span: Span,
  def_id: LocalDefId,
  ) {
- let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
+ let hir_id = cx.tcx.local_def_id_to_hir_id(def_id);
  too_many_arguments::check_fn(cx, kind, decl, span, hir_id, self.too_many_arguments_threshold);
  too_many_lines::check_fn(cx, kind, span, body, self.too_many_lines_threshold);
  not_unsafe_ptr_arg_deref::check_fn(cx, kind, decl, body, def_id);

clippy_lints/src/future_not_send.rs

@@ -62,7 +62,7 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
  if let FnKind::Closure = kind {
  return;
  }
- let ret_ty = return_ty(cx, cx.tcx.hir().local_def_id_to_hir_id(fn_def_id).expect_owner());
+ let ret_ty = return_ty(cx, cx.tcx.local_def_id_to_hir_id(fn_def_id).expect_owner());
  if let ty::Alias(ty::Opaque, AliasTy { def_id, args, .. }) = *ret_ty.kind() {
  let preds = cx.tcx.explicit_item_bounds(def_id);
  let mut is_future = false;

clippy_lints/src/inherent_impl.rs

@@ -63,7 +63,7 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
  && !is_lint_allowed(
  cx,
  MULTIPLE_INHERENT_IMPL,
- cx.tcx.hir().local_def_id_to_hir_id(id),
+ cx.tcx.local_def_id_to_hir_id(id),
  )
  }) {
  for impl_id in impl_ids.iter().map(|id| id.expect_local()) {
@@ -117,7 +117,7 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
 
 /// Gets the span for the given impl block unless it's not being considered by the lint.
 fn get_impl_span(cx: &LateContext<'_>, id: LocalDefId) -> Option<Span> {
- let id = cx.tcx.hir().local_def_id_to_hir_id(id);
+ let id = cx.tcx.local_def_id_to_hir_id(id);
  if let Node::Item(&Item {
  kind: ItemKind::Impl(impl_item),
  span,

clippy_lints/src/len_zero.rs

@@ -142,7 +142,7 @@ impl<'tcx> LateLintPass<'tcx> for LenZero {
  && let TyKind::Path(ty_path) = &imp.self_ty.kind
  && let Some(ty_id) = cx.qpath_res(ty_path, imp.self_ty.hir_id).opt_def_id()
  && let Some(local_id) = ty_id.as_local()
- && let ty_hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_id)
+ && let ty_hir_id = cx.tcx.local_def_id_to_hir_id(local_id)
  && !is_lint_allowed(cx, LEN_WITHOUT_IS_EMPTY, ty_hir_id)
  && let Some(output) =
  parse_len_output(cx, cx.tcx.fn_sig(item.owner_id).instantiate_identity().skip_binder())

clippy_lints/src/manual_non_exhaustive.rs

@@ -192,7 +192,7 @@ impl<'tcx> LateLintPass<'tcx> for ManualNonExhaustiveEnum {
  .contains(&(enum_id.to_def_id(), variant_id.to_def_id()))
  })
  {
- let hir_id = cx.tcx.hir().local_def_id_to_hir_id(enum_id);
+ let hir_id = cx.tcx.local_def_id_to_hir_id(enum_id);
  span_lint_hir_and_then(
  cx,
  MANUAL_NON_EXHAUSTIVE,

clippy_lints/src/methods/filter_map_bool_then.rs

@@ -27,7 +27,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>, arg: &
  closure.def_id.to_def_id(),
  Binder::bind_with_vars(
  cx.typeck_results().node_type(param_ty.hir_id),
- cx.tcx.late_bound_vars(cx.tcx.hir().local_def_id_to_hir_id(closure.def_id)),
+ cx.tcx.late_bound_vars(cx.tcx.local_def_id_to_hir_id(closure.def_id)),
  ),
  )
  && is_copy(cx, param_ty)