Auto merge of rust-lang#113703 - matthiaskrgr:rollup-19uhwuh, r=matth…

…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#113599 (Use maybe_body_owned_by for multiple suggestions)
 - rust-lang#113662 (Rename VecDeque's `rotate_left` and `rotate_right` parameters)
 - rust-lang#113681 (rustdoc-json: Add test for private supertrait.)
 - rust-lang#113682 (trait system refactor ping: also apply to nested modules of `solve`)
 - rust-lang#113685 (Print artifact sizes in `opt-dist`)
 - rust-lang#113688 (llvm-wrapper: update for LLVM API change)
 - rust-lang#113692 (tests: adapt for removal of -opaque-pointers in LLVM 17)
 - rust-lang#113698 (Make it clearer that we're just checking for an RPITIT)
 - rust-lang#113699 (update Miri)

Failed merges:

 - rust-lang#113625 (Structurally normalize in selection)

r? `@ghost`
`@rustbot` modify labels: rollup

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -363,21 +363,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  }
  }
  let hir = self.infcx.tcx.hir();
- if let Some(hir::Node::Item(hir::Item {
- kind: hir::ItemKind::Fn(_, _, body_id),
- ..
- })) = hir.find(self.mir_hir_id())
- && let Some(hir::Node::Expr(expr)) = hir.find(body_id.hir_id)
- {
+ if let Some(body_id) = hir.maybe_body_owned_by(self.mir_def_id()) {
+ let expr = hir.body(body_id).value;
  let place = &self.move_data.move_paths[mpi].place;
- let span = place.as_local()
- .map(|local| self.body.local_decls[local].source_info.span);
- let mut finder = ExpressionFinder {
- expr_span: move_span,
- expr: None,
- pat: None,
- parent_pat: None,
- };
+ let span = place.as_local().map(|local| self.body.local_decls[local].source_info.span);
+ let mut finder =
+ ExpressionFinder { expr_span: move_span, expr: None, pat: None, parent_pat: None };
  finder.visit_expr(expr);
  if let Some(span) = span && let Some(expr) = finder.expr {
  for (_, expr) in hir.parent_iter(expr.hir_id) {
@@ -461,7 +452,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  } = move_spans {
  // We already suggest cloning for these cases in `explain_captures`.
  } else {
- self.suggest_cloning(err, ty, move_span);
+ self.suggest_cloning(err, ty, expr, move_span);
  }
  }
  }
@@ -736,9 +727,21 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  true
  }
 
- fn suggest_cloning(&self, err: &mut Diagnostic, ty: Ty<'tcx>, span: Span) {
+ fn suggest_cloning(
+ &self,
+ err: &mut Diagnostic,
+ ty: Ty<'tcx>,
+ expr: &hir::Expr<'_>,
+ span: Span,
+ ) {
  let tcx = self.infcx.tcx;
  // Try to find predicates on *generic params* that would allow copying `ty`
+ let suggestion =
+ if let Some(symbol) = tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
+ format!(": {}.clone()", symbol)
+ } else {
+ ".clone()".to_owned()
+ };
  if let Some(clone_trait_def) = tcx.lang_items().clone_trait()
  && self.infcx
  .type_implements_trait(
@@ -751,7 +754,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  err.span_suggestion_verbose(
  span.shrink_to_hi(),
  "consider cloning the value if the performance cost is acceptable",
- ".clone()",
+ suggestion,
  Applicability::MachineApplicable,
  );
  }

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -2,7 +2,6 @@ use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed
 use rustc_hir as hir;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::Node;
-use rustc_middle::hir::map::Map;
 use rustc_middle::mir::{Mutability, Place, PlaceRef, ProjectionElem};
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_middle::{
@@ -646,14 +645,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
  }
  let hir_map = self.infcx.tcx.hir();
  let def_id = self.body.source.def_id();
- let hir_id = hir_map.local_def_id_to_hir_id(def_id.as_local().unwrap());
- let node = hir_map.find(hir_id);
- let Some(hir::Node::Item(item)) = node else {
- return;
- };
- let hir::ItemKind::Fn(.., body_id) = item.kind else {
- return;
- };
+ let Some(local_def_id) = def_id.as_local() else { return };
+ let Some(body_id) = hir_map.maybe_body_owned_by(local_def_id) else { return };
  let body = self.infcx.tcx.hir().body(body_id);
 
  let mut v = V { assign_span: span, err, ty, suggested: false };
@@ -790,23 +783,12 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
  // In the future, attempt in all path but initially for RHS of for_loop
  fn suggest_similar_mut_method_for_for_loop(&self, err: &mut Diagnostic) {
  use hir::{
- BodyId, Expr,
+ Expr,
  ExprKind::{Block, Call, DropTemps, Match, MethodCall},
- HirId, ImplItem, ImplItemKind, Item, ItemKind,
  };
 
- fn maybe_body_id_of_fn(hir_map: Map<'_>, id: HirId) -> Option<BodyId> {
- match hir_map.find(id) {
- Some(Node::Item(Item { kind: ItemKind::Fn(_, _, body_id), .. }))
- | Some(Node::ImplItem(ImplItem { kind: ImplItemKind::Fn(_, body_id), .. })) => {
- Some(*body_id)
- }
- _ => None,
- }
- }
  let hir_map = self.infcx.tcx.hir();
- let mir_body_hir_id = self.mir_hir_id();
- if let Some(fn_body_id) = maybe_body_id_of_fn(hir_map, mir_body_hir_id) {
+ if let Some(body_id) = hir_map.maybe_body_owned_by(self.mir_def_id()) {
  if let Block(
  hir::Block {
  expr:
@@ -840,7 +822,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
  ..
  },
  _,
- ) = hir_map.body(fn_body_id).value.kind
+ ) = hir_map.body(body_id).value.kind
  {
  let opt_suggestions = self
  .infcx
@@ -1102,46 +1084,45 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
  }
  let hir_map = self.infcx.tcx.hir();
  let def_id = self.body.source.def_id();
- let hir_id = hir_map.local_def_id_to_hir_id(def_id.expect_local());
- let node = hir_map.find(hir_id);
- let hir_id = if let Some(hir::Node::Item(item)) = node
- && let hir::ItemKind::Fn(.., body_id) = item.kind
- {
- let body = hir_map.body(body_id);
- let mut v = BindingFinder {
- span: err_label_span,
- hir_id: None,
+ let hir_id = if let Some(local_def_id) = def_id.as_local() &&
+ let Some(body_id) = hir_map.maybe_body_owned_by(local_def_id)
+ {
+ let body = hir_map.body(body_id);
+ let mut v = BindingFinder {
+ span: err_label_span,
+ hir_id: None,
+ };
+ v.visit_body(body);
+ v.hir_id
+ } else {
+ None
  };
- v.visit_body(body);
- v.hir_id
- } else {
- None
- };
+
  if let Some(hir_id) = hir_id
  && let Some(hir::Node::Local(local)) = hir_map.find(hir_id)
- {
- let (changing, span, sugg) = match local.ty {
- Some(ty) => ("changing", ty.span, message),
- None => (
- "specifying",
- local.pat.span.shrink_to_hi(),
- format!(": {message}"),
- ),
- };
- err.span_suggestion_verbose(
- span,
- format!("consider {changing} this binding's type"),
- sugg,
- Applicability::HasPlaceholders,
- );
- } else {
- err.span_label(
- err_label_span,
- format!(
- "consider changing this binding's type to be: `{message}`"
- ),
- );
- }
+  {
+  let (changing, span, sugg) = match local.ty {
+  Some(ty) => ("changing", ty.span, message),
+  None => (
+  "specifying",
+  local.pat.span.shrink_to_hi(),
+  format!(": {message}"),
+  ),
+  };
+  err.span_suggestion_verbose(
+  span,
+  format!("consider {changing} this binding's type"),
+  sugg,
+  Applicability::HasPlaceholders,
+  );
+  } else {
+  err.span_label(
+  err_label_span,
+  format!(
+  "consider changing this binding's type to be: `{message}`"
+  ),
+  );
+  }
  }
  None => {}
  }

compiler/rustc_hir_analysis/src/astconv/errors.rs

@@ -123,7 +123,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  let all_candidate_names: Vec<_> = all_candidates()
  .flat_map(|r| self.tcx().associated_items(r.def_id()).in_definition_order())
  .filter_map(|item| {
- if item.opt_rpitit_info.is_none() && item.kind == ty::AssocKind::Type {
+ if !item.is_impl_trait_in_trait() && item.kind == ty::AssocKind::Type {
  Some(item.name)
  } else {
  None
@@ -164,7 +164,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  self.tcx().associated_items(*trait_def_id).in_definition_order()
  })
  .filter_map(|item| {
- if item.opt_rpitit_info.is_none() && item.kind == ty::AssocKind::Type {
+ if !item.is_impl_trait_in_trait() && item.kind == ty::AssocKind::Type {
  Some(item.name)
  } else {
  None

compiler/rustc_hir_analysis/src/astconv/object_safety.rs

@@ -173,7 +173,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  tcx.associated_items(pred.def_id())
  .in_definition_order()
  .filter(|item| item.kind == ty::AssocKind::Type)
- .filter(|item| item.opt_rpitit_info.is_none())
+ .filter(|item| !item.is_impl_trait_in_trait())
  .map(|item| item.def_id),
  );
  }

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

@@ -1322,7 +1322,7 @@ fn compare_number_of_generics<'tcx>(
  // has mismatched type or const generic arguments, then the method that it's
  // inheriting the generics from will also have mismatched arguments, and
  // we'll report an error for that instead. Delay a bug for safety, though.
- if trait_.opt_rpitit_info.is_some() {
+ if trait_.is_impl_trait_in_trait() {
  return Err(tcx.sess.delay_span_bug(
  rustc_span::DUMMY_SP,
  "errors comparing numbers of generics of trait/impl functions were not emitted",
@@ -2116,7 +2116,7 @@ pub(super) fn check_type_bounds<'tcx>(
  // A synthetic impl Trait for RPITIT desugaring has no HIR, which we currently use to get the
  // span for an impl's associated type. Instead, for these, use the def_span for the synthesized
  // associated type.
- let impl_ty_span = if impl_ty.opt_rpitit_info.is_some() {
+ let impl_ty_span = if impl_ty.is_impl_trait_in_trait() {
  tcx.def_span(impl_ty_def_id)
  } else {
  match tcx.hir().get_by_def_id(impl_ty_def_id) {

compiler/rustc_hir_analysis/src/check/mod.rs

@@ -188,7 +188,7 @@ fn missing_items_err(
  full_impl_span: Span,
 ) {
  let missing_items =
- missing_items.iter().filter(|trait_item| trait_item.opt_rpitit_info.is_none());
+ missing_items.iter().filter(|trait_item| !trait_item.is_impl_trait_in_trait());
 
  let missing_items_msg = missing_items
  .clone()

compiler/rustc_hir_typeck/src/demand.rs

@@ -15,7 +15,7 @@ use rustc_middle::ty::error::{ExpectedFound, TypeError};
 use rustc_middle::ty::fold::BottomUpFolder;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{self, Article, AssocItem, Ty, TypeAndMut, TypeFoldable};
-use rustc_span::symbol::{sym, Symbol};
+use rustc_span::symbol::sym;
 use rustc_span::{BytePos, Span, DUMMY_SP};
 use rustc_trait_selection::infer::InferCtxtExt as _;
 use rustc_trait_selection::traits::ObligationCause;
@@ -997,7 +997,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  .collect();
 
  let suggestions_for = |variant: &_, ctor_kind, field_name| {
- let prefix = match self.maybe_get_struct_pattern_shorthand_field(expr) {
+ let prefix = match self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
  Some(ident) => format!("{ident}: "),
  None => String::new(),
  };
@@ -1240,39 +1240,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  }
  }
 
- pub(crate) fn maybe_get_struct_pattern_shorthand_field(
- &self,
- expr: &hir::Expr<'_>,
- ) -> Option<Symbol> {
- let hir = self.tcx.hir();
- let local = match expr {
- hir::Expr {
- kind:
- hir::ExprKind::Path(hir::QPath::Resolved(
- None,
- hir::Path {
- res: hir::def::Res::Local(_),
- segments: [hir::PathSegment { ident, .. }],
- ..
- },
- )),
- ..
- } => Some(ident),
- _ => None,
- }?;
-
- match hir.find_parent(expr.hir_id)? {
- Node::ExprField(field) => {
- if field.ident.name == local.name && field.is_shorthand {
- return Some(local.name);
- }
- }
- _ => {}
- }
-
- None
- }
-
  /// If the given `HirId` corresponds to a block with a trailing expression, return that expression
  pub(crate) fn maybe_get_block_expr(
  &self,
@@ -1467,7 +1434,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  ));
  }
 
- let prefix = match self.maybe_get_struct_pattern_shorthand_field(expr) {
+ let prefix = match self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
  Some(ident) => format!("{ident}: "),
  None => String::new(),
  };
@@ -1661,7 +1628,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  )
  };
 
- let prefix = match self.maybe_get_struct_pattern_shorthand_field(expr) {
+ let prefix = match self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
  Some(ident) => format!("{ident}: "),
  None => String::new(),
  };

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -395,7 +395,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  vec![(expr.span.shrink_to_hi(), format!(".{}()", conversion_method.name))]
  };
  let struct_pat_shorthand_field =
- self.maybe_get_struct_pattern_shorthand_field(expr);
+ self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr);
  if let Some(name) = struct_pat_shorthand_field {
  sugg.insert(0, (expr.span.shrink_to_lo(), format!("{}: ", name)));
  }
@@ -1069,7 +1069,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  )
  .must_apply_modulo_regions()
  {
- let suggestion = match self.maybe_get_struct_pattern_shorthand_field(expr) {
+ let suggestion = match self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
  Some(ident) => format!(": {}.clone()", ident),
  None => ".clone()".to_string()
  };
@@ -1247,7 +1247,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  return false;
  }
 
- let suggestion = match self.maybe_get_struct_pattern_shorthand_field(expr) {
+ let suggestion = match self.tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {
  Some(ident) => format!(": {}.is_some()", ident),
  None => ".is_some()".to_string(),
  };

compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp

@@ -7,6 +7,7 @@
 // * https://github.com/llvm/llvm-project/blob/8ef3e895ad8ab1724e2b87cabad1dacdc7a397a3/llvm/include/llvm/Object/ArchiveWriter.h
 // * https://github.com/llvm/llvm-project/blob/8ef3e895ad8ab1724e2b87cabad1dacdc7a397a3/llvm/lib/Object/ArchiveWriter.cpp
 
+#include "llvm/ADT/SmallString.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Object/ObjectFile.h"
 

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1136,7 +1136,7 @@ fn should_encode_type(tcx: TyCtxt<'_>, def_id: LocalDefId, def_kind: DefKind) ->
  // the default projection predicates in default trait methods
  // with RPITITs.
  ty::AssocItemContainer::TraitContainer => {
- assoc_item.defaultness(tcx).has_value() || assoc_item.opt_rpitit_info.is_some()
+ assoc_item.defaultness(tcx).has_value() || assoc_item.is_impl_trait_in_trait()
  }
  }
  }