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

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

Author: bors

compiler/rustc_ast_lowering/src/contract.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use thin_vec::thin_vec;
 
 use crate::LoweringContext;
@@ -128,7 +130,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  let req_span = self.mark_span_with_reason(
  rustc_span::DesugaringKind::Contract,
  lowered_req.span,
- None,
+ Some(Arc::clone(&self.allow_contracts)),
  );
  let precond = self.expr_call_lang_item_fn_mut(
  req_span,
@@ -143,8 +145,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  ens: &Box<rustc_ast::Expr>,
  ) -> &'hir rustc_hir::Expr<'hir> {
  let ens_span = self.lower_span(ens.span);
- let ens_span =
- self.mark_span_with_reason(rustc_span::DesugaringKind::Contract, ens_span, None);
+ let ens_span = self.mark_span_with_reason(
+ rustc_span::DesugaringKind::Contract,
+ ens_span,
+ Some(Arc::clone(&self.allow_contracts)),
+ );
  let lowered_ens = self.lower_expr_mut(&ens);
  self.expr_call_lang_item_fn(
  ens_span,

compiler/rustc_ast_lowering/src/expr.rs

@@ -865,6 +865,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  };
 
  let features = match await_kind {
+ FutureKind::Future if is_async_gen => Some(Arc::clone(&self.allow_async_gen)),
  FutureKind::Future => None,
  FutureKind::AsyncIterator => Some(Arc::clone(&self.allow_for_await)),
  };
@@ -1479,7 +1480,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  fn lower_expr_range_closed(&mut self, span: Span, e1: &Expr, e2: &Expr) -> hir::ExprKind<'hir> {
  let e1 = self.lower_expr_mut(e1);
  let e2 = self.lower_expr_mut(e2);
- let fn_path = hir::QPath::LangItem(hir::LangItem::RangeInclusiveNew, span);
+ let fn_path = self.make_lang_item_qpath(hir::LangItem::RangeInclusiveNew, span, None);
  let fn_expr = self.arena.alloc(self.expr(span, hir::ExprKind::Path(fn_path)));
  hir::ExprKind::Call(fn_expr, arena_vec![self; e1, e2])
  }
@@ -1565,7 +1566,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  );
 
  hir::ExprKind::Struct(
- self.arena.alloc(hir::QPath::LangItem(lang_item, span)),
+ self.arena.alloc(self.make_lang_item_qpath(lang_item, span, None)),
  fields,
  hir::StructTailExpr::None,
  )
@@ -1715,8 +1716,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
  // `yield $expr` is transformed into `task_context = yield async_gen_ready($expr)`.
  // This ensures that we store our resumed `ResumeContext` correctly, and also that
  // the apparent value of the `yield` expression is `()`.
- let wrapped_yielded = self.expr_call_lang_item_fn(
+ let desugar_span = self.mark_span_with_reason(
+ DesugaringKind::Async,
  span,
+ Some(Arc::clone(&self.allow_async_gen)),
+ );
+ let wrapped_yielded = self.expr_call_lang_item_fn(
+ desugar_span,
  hir::LangItem::AsyncGenReady,
  std::slice::from_ref(yielded),
  );
@@ -1728,7 +1734,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  unreachable!("use of `await` outside of an async context.");
  };
  let task_context_ident = Ident::with_dummy_span(sym::_task_context);
- let lhs = self.expr_ident(span, task_context_ident, task_context_hid);
+ let lhs = self.expr_ident(desugar_span, task_context_ident, task_context_hid);
 
  hir::ExprKind::Assign(lhs, yield_expr, self.lower_span(span))
  } else {
@@ -2161,7 +2167,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  lang_item: hir::LangItem,
  fields: &'hir [hir::Expr<'hir>],
  ) -> hir::Expr<'hir> {
- let path = self.arena.alloc(self.lang_item_path(span, lang_item));
+ let path = self.arena.alloc(self.make_lang_item_qpath(lang_item, span, None));
  self.expr_enum_variant(span, path, fields)
  }
 
@@ -2198,16 +2204,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
  span: Span,
  lang_item: hir::LangItem,
  ) -> hir::Expr<'hir> {
- let path = self.lang_item_path(span, lang_item);
- self.expr(span, hir::ExprKind::Path(path))
- }
-
- pub(super) fn lang_item_path(
- &mut self,
- span: Span,
- lang_item: hir::LangItem,
- ) -> hir::QPath<'hir> {
- hir::QPath::LangItem(lang_item, self.lower_span(span))
+ let qpath = self.make_lang_item_qpath(lang_item, self.lower_span(span), None);
+ self.expr(span, hir::ExprKind::Path(qpath))
  }
 
  /// `<LangItem>::name`

compiler/rustc_ast_lowering/src/format.rs

@@ -391,7 +391,8 @@ fn make_format_spec<'hir>(
  let flags = ctx.expr_field(Ident::new(sym::flags, sp), ctx.arena.alloc(flags), sp);
  let precision = ctx.expr_field(Ident::new(sym::precision, sp), ctx.arena.alloc(precision), sp);
  let width = ctx.expr_field(Ident::new(sym::width, sp), ctx.arena.alloc(width), sp);
- let placeholder = ctx.arena.alloc(hir::QPath::LangItem(hir::LangItem::FormatPlaceholder, sp));
+ let placeholder =
+ ctx.arena.alloc(ctx.make_lang_item_qpath(hir::LangItem::FormatPlaceholder, sp, None));
  let fields = ctx.arena.alloc_from_iter([position, flags, precision, width]);
  ctx.expr(sp, hir::ExprKind::Struct(placeholder, fields, hir::StructTailExpr::None))
 }

compiler/rustc_ast_lowering/src/lib.rs

@@ -138,9 +138,11 @@ struct LoweringContext<'a, 'hir> {
  #[cfg(debug_assertions)]
  node_id_to_local_id: NodeMap<hir::ItemLocalId>,
 
+ allow_contracts: Arc<[Symbol]>,
  allow_try_trait: Arc<[Symbol]>,
  allow_gen_future: Arc<[Symbol]>,
  allow_pattern_type: Arc<[Symbol]>,
+ allow_async_gen: Arc<[Symbol]>,
  allow_async_iterator: Arc<[Symbol]>,
  allow_for_await: Arc<[Symbol]>,
  allow_async_fn_traits: Arc<[Symbol]>,
@@ -183,15 +185,17 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  current_item: None,
  impl_trait_defs: Vec::new(),
  impl_trait_bounds: Vec::new(),
+ allow_contracts: [sym::contracts_internals].into(),
  allow_try_trait: [sym::try_trait_v2, sym::yeet_desugar_details].into(),
  allow_pattern_type: [sym::pattern_types, sym::pattern_type_range_trait].into(),
  allow_gen_future: if tcx.features().async_fn_track_caller() {
  [sym::gen_future, sym::closure_track_caller].into()
  } else {
  [sym::gen_future].into()
  },
- allow_for_await: [sym::async_iterator].into(),
+ allow_for_await: [sym::async_gen_internals, sym::async_iterator].into(),
  allow_async_fn_traits: [sym::async_fn_traits].into(),
+ allow_async_gen: [sym::async_gen_internals].into(),
  // FIXME(gen_blocks): how does `closure_track_caller`/`async_fn_track_caller`
  // interact with `gen`/`async gen` blocks
  allow_async_iterator: [sym::gen_future, sym::async_iterator].into(),
@@ -2531,8 +2535,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  lang_item: hir::LangItem,
  fields: &'hir [hir::PatField<'hir>],
  ) -> &'hir hir::Pat<'hir> {
- let qpath = hir::QPath::LangItem(lang_item, self.lower_span(span));
- self.pat(span, hir::PatKind::Struct(qpath, fields, None))
+ let path = self.make_lang_item_qpath(lang_item, self.lower_span(span), None);
+ self.pat(span, hir::PatKind::Struct(path, fields, None))
  }
 
  fn pat_ident(&mut self, span: Span, ident: Ident) -> (&'hir hir::Pat<'hir>, HirId) {

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -503,8 +503,8 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  }
  if let hir::Node::Expr(parent_expr) = parent
  && let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
- && let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IntoIterIntoIter, _)) =
-  call_expr.kind
+ && let hir::ExprKind::Path(qpath) = call_expr.kind
+ && tcx.qpath_is_lang_item(qpath, LangItem::IntoIterIntoIter)
  {
  // Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
  } else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans
@@ -2312,6 +2312,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  let typeck_results = tcx.typeck(self.mir_def_id());
 
  struct ExprFinder<'hir> {
+ tcx: TyCtxt<'hir>,
  issue_span: Span,
  expr_span: Span,
  body_expr: Option<&'hir hir::Expr<'hir>>,
@@ -2336,9 +2337,10 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  // };
  // corresponding to the desugaring of a for loop `for <pat> in <head> { <body> }`.
  if let hir::ExprKind::Call(path, [arg]) = ex.kind
- && let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IntoIterIntoIter, _)) =
-  path.kind
+ && let hir::ExprKind::Path(qpath) = path.kind
+ && self.tcx.qpath_is_lang_item(qpath, LangItem::IntoIterIntoIter)
  && arg.span.contains(self.issue_span)
+ && ex.span.desugaring_kind() == Some(DesugaringKind::ForLoop)
  {
  // Find `IntoIterator::into_iter(<head>)`
  self.head = Some(arg);
@@ -2355,10 +2357,10 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  ..
  }) = stmt.kind
  && let hir::ExprKind::Call(path, _args) = call.kind
- && let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IteratorNext, _)) =
-  path.kind
- && let hir::PatKind::Struct(path, [field, ..], _) = bind.pat.kind
- && let hir::QPath::LangItem(LangItem::OptionSome, pat_span) = path
+ && let hir::ExprKind::Path(qpath) = path.kind
+ && self.tcx.qpath_is_lang_item(qpath, LangItem::IteratorNext)
+ && let hir::PatKind::Struct(qpath, [field, ..], _) = bind.pat.kind
+ && self.tcx.qpath_is_lang_item(qpath, LangItem::OptionSome)
  && call.span.contains(self.issue_span)
  {
  // Find `<pat>` and the span for the whole `for` loop.
@@ -2370,7 +2372,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  self.loop_bind = Some(ident);
  }
  self.head_span = Some(*head_span);
- self.pat_span = Some(pat_span);
+ self.pat_span = Some(bind.pat.span);
  self.loop_span = Some(stmt.span);
  }
 
@@ -2385,6 +2387,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
  }
  }
  let mut finder = ExprFinder {
+ tcx,
  expr_span: span,
  issue_span,
  loop_bind: None,