Auto merge of #118763 - matthiaskrgr:rollup-mgyf5hp, r=matthiaskrgr

Rollup of 6 pull requests

Successful merges:

 - #117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`)
 - #118502 (fix: correct the arg for 'suggest to use associated function syntax' diagnostic)
 - #118694 (Add instance evaluation and methods to read an allocation in StableMIR)
 - #118715 (privacy: visit trait def id of projections)
 - #118730 (recurse into refs when comparing tys for diagnostics)
 - #118736 (temporarily revert "ice on ambguity in mir typeck")

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

Cargo.lock

@@ -4303,6 +4303,13 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rustc_next_trait_solver"
+version = "0.0.0"
+dependencies = [
+ "rustc_type_ir",
+]
+
 [[package]]
 name = "rustc_parse"
 version = "0.0.0"
@@ -4487,6 +4494,7 @@ dependencies = [
 name = "rustc_smir"
 version = "0.0.0"
 dependencies = [
+ "rustc_abi",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_middle",
@@ -4571,6 +4579,7 @@ dependencies = [
  "rustc_infer",
  "rustc_macros",
  "rustc_middle",
+ "rustc_next_trait_solver",
  "rustc_parse_format",
  "rustc_query_system",
  "rustc_session",

compiler/rustc_hir_typeck/src/method/suggest.rs

@@ -1591,10 +1591,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  {
  let sig = self.tcx.fn_sig(assoc.def_id).instantiate_identity();
  sig.inputs().skip_binder().get(0).and_then(|first| {
- if first.peel_refs() == rcvr_ty.peel_refs() {
-  None
- } else {
+ let impl_ty = self.tcx.type_of(*impl_did).instantiate_identity();
+ // if the type of first arg is the same as the current impl type, we should take the first arg into assoc function
+ if first.peel_refs() == impl_ty {
  Some(first.ref_mutability().map_or("", |mutbl| mutbl.ref_prefix_str()))
+ } else {
+ None
  }
  })
  } else {

compiler/rustc_infer/src/infer/error_reporting/mod.rs

@@ -1181,37 +1181,54 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  debug!("cmp(t1={}, t1.kind={:?}, t2={}, t2.kind={:?})", t1, t1.kind(), t2, t2.kind());
 
  // helper functions
- fn equals<'tcx>(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
- match (a.kind(), b.kind()) {
- (a, b) if *a == *b => true,
- (&ty::Int(_), &ty::Infer(ty::InferTy::IntVar(_)))
- | (
- &ty::Infer(ty::InferTy::IntVar(_)),
- &ty::Int(_) | &ty::Infer(ty::InferTy::IntVar(_)),
- )
- | (&ty::Float(_), &ty::Infer(ty::InferTy::FloatVar(_)))
- | (
- &ty::Infer(ty::InferTy::FloatVar(_)),
- &ty::Float(_) | &ty::Infer(ty::InferTy::FloatVar(_)),
- ) => true,
- _ => false,
+ let recurse = |t1, t2, values: &mut (DiagnosticStyledString, DiagnosticStyledString)| {
+ let (x1, x2) = self.cmp(t1, t2);
+ (values.0).0.extend(x1.0);
+ (values.1).0.extend(x2.0);
+ };
+
+ fn fmt_region<'tcx>(region: ty::Region<'tcx>) -> String {
+ let mut r = region.to_string();
+ if r == "'_" {
+ r.clear();
+ } else {
+ r.push(' ');
  }
+ format!("&{r}")
  }
 
- fn push_ty_ref<'tcx>(
+ fn push_ref<'tcx>(
  region: ty::Region<'tcx>,
- ty: Ty<'tcx>,
  mutbl: hir::Mutability,
  s: &mut DiagnosticStyledString,
  ) {
- let mut r = region.to_string();
- if r == "'_" {
- r.clear();
+ s.push_highlighted(fmt_region(region));
+ s.push_highlighted(mutbl.prefix_str());
+ }
+
+ fn cmp_ty_refs<'tcx>(
+ r1: ty::Region<'tcx>,
+ mut1: hir::Mutability,
+ r2: ty::Region<'tcx>,
+ mut2: hir::Mutability,
+ ss: &mut (DiagnosticStyledString, DiagnosticStyledString),
+ ) {
+ let (r1, r2) = (fmt_region(r1), fmt_region(r2));
+ if r1 != r2 {
+ ss.0.push_highlighted(r1);
+ ss.1.push_highlighted(r2);
  } else {
- r.push(' ');
+ ss.0.push_normal(r1);
+ ss.1.push_normal(r2);
+ }
+
+ if mut1 != mut2 {
+ ss.0.push_highlighted(mut1.prefix_str());
+ ss.1.push_highlighted(mut2.prefix_str());
+ } else {
+ ss.0.push_normal(mut1.prefix_str());
+ ss.1.push_normal(mut2.prefix_str());
  }
- s.push_highlighted(format!("&{}{}", r, mutbl.prefix_str()));
- s.push_normal(ty.to_string());
  }
 
  // process starts here
@@ -1310,9 +1327,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  values.0.push_normal("_");
  values.1.push_normal("_");
  } else {
- let (x1, x2) = self.cmp(ta1, ta2);
- (values.0).0.extend(x1.0);
- (values.1).0.extend(x2.0);
+ recurse(ta1, ta2, &mut values);
  }
  self.push_comma(&mut values.0, &mut values.1, len, i);
  }
@@ -1418,27 +1433,24 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  }
  }
 
- // When finding T != &T, highlight only the borrow
- (&ty::Ref(r1, ref_ty1, mutbl1), _) if equals(ref_ty1, t2) => {
+ // When finding `&T != &T`, compare the references, then recurse into pointee type
+ (&ty::Ref(r1, ref_ty1, mutbl1), &ty::Ref(r2, ref_ty2, mutbl2)) => {
  let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
- push_ty_ref(r1, ref_ty1, mutbl1, &mut values.0);
- values.1.push_normal(t2.to_string());
+ cmp_ty_refs(r1, mutbl1, r2, mutbl2, &mut values);
+ recurse(ref_ty1, ref_ty2, &mut values);
  values
  }
- (_, &ty::Ref(r2, ref_ty2, mutbl2)) if equals(t1, ref_ty2) => {
+ // When finding T != &T, highlight the borrow
+ (&ty::Ref(r1, ref_ty1, mutbl1), _) => {
  let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
- values.0.push_normal(t1.to_string());
- push_ty_ref(r2, ref_ty2, mutbl2, &mut values.1);
+ push_ref(r1, mutbl1, &mut values.0);
+ recurse(ref_ty1, t2, &mut values);
  values
  }
-
- // When encountering &T != &mut T, highlight only the borrow
- (&ty::Ref(r1, ref_ty1, mutbl1), &ty::Ref(r2, ref_ty2, mutbl2))
- if equals(ref_ty1, ref_ty2) =>
- {
+ (_, &ty::Ref(r2, ref_ty2, mutbl2)) => {
  let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
- push_ty_ref(r1, ref_ty1, mutbl1, &mut values.0);
- push_ty_ref(r2, ref_ty2, mutbl2, &mut values.1);
+ push_ref(r2, mutbl2, &mut values.1);
+ recurse(t1, ref_ty2, &mut values);
  values
  }
 
@@ -1448,9 +1460,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  (DiagnosticStyledString::normal("("), DiagnosticStyledString::normal("("));
  let len = args1.len();
  for (i, (left, right)) in args1.iter().zip(args2).enumerate() {
- let (x1, x2) = self.cmp(left, right);
- (values.0).0.extend(x1.0);
- (values.1).0.extend(x2.0);
+ recurse(left, right, &mut values);
  self.push_comma(&mut values.0, &mut values.1, len, i);
  }
  if len == 1 {

compiler/rustc_infer/src/infer/mod.rs

@@ -345,37 +345,61 @@ pub struct InferCtxt<'tcx> {
 impl<'tcx> ty::InferCtxtLike for InferCtxt<'tcx> {
  type Interner = TyCtxt<'tcx>;
 
- fn universe_of_ty(&self, ty: ty::InferTy) -> Option<ty::UniverseIndex> {
- use InferTy::*;
-  match ty {
- // FIXME(BoxyUwU): this is kind of jank and means that printing unresolved
-  // ty infers will give you the universe of the var it resolved to not the universe
-  // it actually had. It also means that if you have a `?0.1` and infer it to `u8` then
-  // try to print out `?0.1` it will just print `?0`.
-  TyVar(ty_vid) => match self.probe_ty_var(ty_vid) {
-  Err(universe) => Some(universe),
-  Ok(_) => None,
- },
- IntVar(_) | FloatVar(_) | FreshTy(_) | FreshIntTy(_) | FreshFloatTy(_) => None,
+ fn interner(&self) -> TyCtxt<'tcx> {
+ self.tcx
+ }
+
+ fn universe_of_ty(&self, vid: TyVid) -> Option<ty::UniverseIndex> {
+ // FIXME(BoxyUwU): this is kind of jank and means that printing unresolved
+ // ty infers will give you the universe of the var it resolved to not the universe
+ // it actually had. It also means that if you have a `?0.1` and infer it to `u8` then
+ // try to print out `?0.1` it will just print `?0`.
+ match self.probe_ty_var(vid) {
+ Err(universe) => Some(universe),
+ Ok(_) => None,
  }
  }
 
- fn universe_of_ct(&self, ct: ty::InferConst) -> Option<ty::UniverseIndex> {
- use ty::InferConst::*;
- match ct {
- // Same issue as with `universe_of_ty`
- Var(ct_vid) => match self.probe_const_var(ct_vid) {
- Err(universe) => Some(universe),
- Ok(_) => None,
- },
- EffectVar(_) => None,
- Fresh(_) => None,
+ fn universe_of_ct(&self, ct: ConstVid) -> Option<ty::UniverseIndex> {
+ // Same issue as with `universe_of_ty`
+ match self.probe_const_var(ct) {
+ Err(universe) => Some(universe),
+ Ok(_) => None,
  }
  }
 
  fn universe_of_lt(&self, lt: ty::RegionVid) -> Option<ty::UniverseIndex> {
  Some(self.universe_of_region_vid(lt))
  }
+
+ fn root_ty_var(&self, vid: TyVid) -> TyVid {
+ self.root_var(vid)
+ }
+
+ fn probe_ty_var(&self, vid: TyVid) -> Option<Ty<'tcx>> {
+ self.probe_ty_var(vid).ok()
+ }
+
+ fn root_lt_var(&self, vid: ty::RegionVid) -> ty::RegionVid {
+ self.root_region_var(vid)
+ }
+
+ fn probe_lt_var(&self, vid: ty::RegionVid) -> Option<ty::Region<'tcx>> {
+ let re = self
+ .inner
+ .borrow_mut()
+ .unwrap_region_constraints()
+ .opportunistic_resolve_var(self.tcx, vid);
+ if re.is_var() { None } else { Some(re) }
+ }
+
+ fn root_ct_var(&self, vid: ConstVid) -> ConstVid {
+ self.root_const_var(vid)
+ }
+
+ fn probe_ct_var(&self, vid: ConstVid) -> Option<ty::Const<'tcx>> {
+ self.probe_const_var(vid).ok()
+ }
 }
 
 /// See the `error_reporting` module for more details.
@@ -1347,6 +1371,10 @@ impl<'tcx> InferCtxt<'tcx> {
  self.inner.borrow_mut().type_variables().root_var(var)
  }
 
+ pub fn root_region_var(&self, var: ty::RegionVid) -> ty::RegionVid {
+ self.inner.borrow_mut().unwrap_region_constraints().root_var(var)
+ }
+
  pub fn root_const_var(&self, var: ty::ConstVid) -> ty::ConstVid {
  self.inner.borrow_mut().const_unification_table().find(var).vid
  }

compiler/rustc_infer/src/infer/region_constraints/mod.rs

@@ -623,6 +623,11 @@ impl<'tcx> RegionConstraintCollector<'_, 'tcx> {
  }
  }
 
+ pub fn root_var(&mut self, vid: ty::RegionVid) -> ty::RegionVid {
+ let mut ut = self.unification_table_mut(); // FIXME(rust-lang/ena#42): unnecessary mut
+ ut.find(vid).vid
+ }
+
  fn combine_map(&mut self, t: CombineMapType) -> &mut CombineMap<'tcx> {
  match t {
  Glb => &mut self.glbs,

compiler/rustc_middle/src/ty/consts.rs

@@ -7,7 +7,7 @@ use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::LocalDefId;
 use rustc_macros::HashStable;
-use rustc_type_ir::{TypeFlags, WithCachedTypeInfo};
+use rustc_type_ir::{ConstTy, IntoKind, TypeFlags, WithCachedTypeInfo};
 
 mod int;
 mod kind;
@@ -26,6 +26,20 @@ use super::sty::ConstKind;
 #[rustc_pass_by_value]
 pub struct Const<'tcx>(pub(super) Interned<'tcx, WithCachedTypeInfo<ConstData<'tcx>>>);
 
+impl<'tcx> IntoKind for Const<'tcx> {
+ type Kind = ConstKind<'tcx>;
+
+ fn kind(self) -> ConstKind<'tcx> {
+ self.kind().clone()
+ }
+}
+
+impl<'tcx> ConstTy<TyCtxt<'tcx>> for Const<'tcx> {
+ fn ty(self) -> Ty<'tcx> {
+ self.ty()
+ }
+}
+
 /// Typed constant value.
 #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, HashStable, TyEncodable, TyDecodable)]
 pub struct ConstData<'tcx> {

compiler/rustc_middle/src/ty/context.rs

@@ -133,6 +133,31 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
  ) -> (Self::Ty, ty::Mutability) {
  (ty, mutbl)
  }
+
+ fn mk_canonical_var_infos(self, infos: &[ty::CanonicalVarInfo<Self>]) -> Self::CanonicalVars {
+ self.mk_canonical_var_infos(infos)
+ }
+
+ fn mk_bound_ty(self, debruijn: ty::DebruijnIndex, var: ty::BoundVar) -> Self::Ty {
+ Ty::new_bound(self, debruijn, ty::BoundTy { var, kind: ty::BoundTyKind::Anon })
+ }
+
+ fn mk_bound_region(self, debruijn: ty::DebruijnIndex, var: ty::BoundVar) -> Self::Region {
+ Region::new_bound(
+ self,
+ debruijn,
+ ty::BoundRegion { var, kind: ty::BoundRegionKind::BrAnon },
+ )
+ }
+
+ fn mk_bound_const(
+ self,
+ debruijn: ty::DebruijnIndex,
+ var: ty::BoundVar,
+ ty: Self::Ty,
+ ) -> Self::Const {
+ Const::new_bound(self, debruijn, var, ty)
+ }
 }
 
 type InternedSet<'tcx, T> = ShardedHashMap<InternedInSet<'tcx, T>, ()>;