Auto merge of #148193 - camsteffen:remove-qpath-langitem, r=cjgillot

Remove `QPath::LangItem` Closes #115178. r? cjgillot

Author: bors

clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -550,7 +550,6 @@ fn get_item_name(item: &Item<'_>) -> Option<String> {
  // This case doesn't exist in the clippy tests codebase.
  None
  },
- QPath::LangItem(_, _) => None,
  }
  } else {
  // Impls for anything that isn't a named type can be skipped.

clippy_lints/src/incompatible_msrv.rs

@@ -4,7 +4,7 @@ use clippy_utils::msrvs::Msrv;
 use clippy_utils::{is_in_const_context, is_in_test};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def::DefKind;
-use rustc_hir::{self as hir, AmbigArg, Expr, ExprKind, HirId, QPath, RustcVersion, StabilityLevel, StableSince};
+use rustc_hir::{self as hir, AmbigArg, Expr, ExprKind, HirId, RustcVersion, StabilityLevel, StableSince};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::impl_lint_pass;
@@ -193,10 +193,7 @@ impl<'tcx> LateLintPass<'tcx> for IncompatibleMsrv {
  self.emit_lint_if_under_msrv(cx, method_did, expr.hir_id, span);
  }
  },
- // Desugaring into function calls by the compiler will use `QPath::LangItem` variants. Those should
- // not be linted as they will not be generated in older compilers if the function is not available,
- // and the compiler is allowed to call unstable functions.
- ExprKind::Path(qpath @ (QPath::Resolved(..) | QPath::TypeRelative(..))) => {
+ ExprKind::Path(qpath) => {
  if let Some(path_def_id) = cx.qpath_res(&qpath, expr.hir_id).opt_def_id() {
  self.emit_lint_if_under_msrv(cx, path_def_id, expr.hir_id, expr.span);
  }
@@ -206,7 +203,7 @@ impl<'tcx> LateLintPass<'tcx> for IncompatibleMsrv {
  }
 
  fn check_ty(&mut self, cx: &LateContext<'tcx>, hir_ty: &'tcx hir::Ty<'tcx, AmbigArg>) {
- if let hir::TyKind::Path(qpath @ (QPath::Resolved(..) | QPath::TypeRelative(..))) = hir_ty.kind
+ if let hir::TyKind::Path(qpath) = hir_ty.kind
  && let Some(ty_def_id) = cx.qpath_res(&qpath, hir_ty.hir_id).opt_def_id()
  // `CStr` and `CString` have been moved around but have been available since Rust 1.0.0
  && !matches!(cx.tcx.get_diagnostic_name(ty_def_id), Some(sym::cstr_type | sym::cstring_type))

clippy_lints/src/indexing_slicing.rs

@@ -124,7 +124,7 @@ impl<'tcx> LateLintPass<'tcx> for IndexingSlicing {
  let note = "the suggestion might not be applicable in constant blocks";
  let ty = cx.typeck_results().expr_ty(array).peel_refs();
  let allowed_in_tests = self.allow_indexing_slicing_in_tests && is_in_test(cx.tcx, expr.hir_id);
- if let Some(range) = higher::Range::hir(index) {
+ if let Some(range) = higher::Range::hir(cx, index) {
  // Ranged indexes, i.e., &x[n..m], &x[n..], &x[..n] and &x[..]
  if let ty::Array(_, s) = ty.kind() {
  let size: u128 = if let Some(size) = s.try_to_target_usize(cx.tcx) {

clippy_lints/src/infinite_iter.rs

@@ -178,7 +178,7 @@ fn is_infinite(cx: &LateContext<'_>, expr: &Expr<'_>) -> Finiteness {
  Finite
  }
  },
- ExprKind::Struct(..) => higher::Range::hir(expr).is_some_and(|r| r.end.is_none()).into(),
+ ExprKind::Struct(..) => higher::Range::hir(cx, expr).is_some_and(|r| r.end.is_none()).into(),
  _ => Finite,
  }
 }

clippy_lints/src/large_futures.rs

@@ -4,7 +4,7 @@ use clippy_utils::source::snippet;
 use clippy_utils::ty::implements_trait;
 use rustc_abi::Size;
 use rustc_errors::Applicability;
-use rustc_hir::{Expr, ExprKind, LangItem, MatchSource, QPath};
+use rustc_hir::{Expr, ExprKind, LangItem, MatchSource};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::impl_lint_pass;
 
@@ -58,7 +58,8 @@ impl<'tcx> LateLintPass<'tcx> for LargeFuture {
  fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
  if let ExprKind::Match(scrutinee, _, MatchSource::AwaitDesugar) = expr.kind
  && let ExprKind::Call(func, [arg]) = scrutinee.kind
- && let ExprKind::Path(QPath::LangItem(LangItem::IntoFutureIntoFuture, ..)) = func.kind
+ && let ExprKind::Path(qpath) = func.kind
+ && cx.tcx.qpath_is_lang_item(qpath, LangItem::IntoFutureIntoFuture)
  && !expr.span.from_expansion()
  && let ty = cx.typeck_results().expr_ty(arg)
  && let Some(future_trait_def_id) = cx.tcx.lang_items().future_trait()

clippy_lints/src/loops/char_indices_as_byte_indices.rs

@@ -131,7 +131,7 @@ fn check_index_usage<'tcx>(
 fn index_consumed_at<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> Option<&'tcx Expr<'tcx>> {
  for (_, node) in cx.tcx.hir_parent_iter(expr.hir_id) {
  match node {
- Node::Expr(expr) if higher::Range::hir(expr).is_some() => {},
+ Node::Expr(expr) if higher::Range::hir(cx, expr).is_some() => {},
  Node::ExprField(_) => {},
  Node::Expr(expr) => return Some(expr),
  _ => break,

clippy_lints/src/loops/manual_memcpy.rs

@@ -29,7 +29,7 @@ pub(super) fn check<'tcx>(
  end: Some(end),
  limits,
  span: _,
- }) = higher::Range::hir(arg)
+ }) = higher::Range::hir(cx, arg)
  // the var must be a single name
  && let PatKind::Binding(_, canonical_id, _, _) = pat.kind
  {

clippy_lints/src/loops/manual_slice_fill.rs

@@ -32,7 +32,7 @@ pub(super) fn check<'tcx>(
  end: Some(end),
  limits: RangeLimits::HalfOpen,
  span: _,
- }) = higher::Range::hir(arg)
+ }) = higher::Range::hir(cx, arg)
  && let ExprKind::Lit(Spanned {
  node: LitKind::Int(Pu128(0), _),
  ..

clippy_lints/src/loops/mut_range_bound.rs

@@ -16,7 +16,7 @@ pub(super) fn check(cx: &LateContext<'_>, arg: &Expr<'_>, body: &Expr<'_>) {
  start: Some(start),
  end: Some(end),
  ..
- }) = higher::Range::hir(arg)
+ }) = higher::Range::hir(cx, arg)
  && let (mut_id_start, mut_id_end) = (check_for_mutability(cx, start), check_for_mutability(cx, end))
  && (mut_id_start.is_some() || mut_id_end.is_some())
  {

clippy_lints/src/loops/needless_range_loop.rs

@@ -31,7 +31,7 @@ pub(super) fn check<'tcx>(
  ref end,
  limits,
  span,
- }) = higher::Range::hir(arg)
+ }) = higher::Range::hir(cx, arg)
  // the var must be a single name
  && let PatKind::Binding(_, canonical_id, ident, _) = pat.kind
  {