Auto merge of #146333 - matthiaskrgr:rollup-ib80jyw, r=matthiaskrgr

Rollup of 7 pull requests
Successful merges:
- #146111 (Migrate more things in the new solver to specific `DefId`s)
- #146298 (GVN: Ensure indirect is first projection in try_as_place.)
- #146299 (docs(std): add error docs for path canonicalize)
- #146310 (Allow static regions in `type_name`.)
- #146313 (Some `rustc_middle` cleanups)
- #146319 (Fix typo in default.rs)
- #146320 (rustc-dev-guide subtree update)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_const_eval/src/util/type_name.rs

@@ -168,10 +168,11 @@ impl<'tcx> PrettyPrinter<'tcx> for TypeNamePrinter<'tcx> {
 // Bound regions are always printed (as `'_`), which gives some idea that they are special,
 // even though the `for` is omitted by the pretty printer.
 // E.g. `for<'a, 'b> fn(&'a u32, &'b u32)` is printed as "fn(&'_ u32, &'_ u32)".
+let kind = region.kind();
 match region.kind(){
- ty::ReErased | ty::ReEarlyParam(_) => false,
+ ty::ReErased | ty::ReEarlyParam(_)| ty::ReStatic=> false,
  ty::ReBound(..) => true,
- _ => unreachable!(),
+ _ => panic!("type_name unhandled region: {kind:?}"),
 }
 }
 

compiler/rustc_infer/src/infer/relate/generalize.rs

@@ -6,8 +6,8 @@ use rustc_hir::def_id::DefId;
 use rustc_middle::bug;
 use rustc_middle::ty::error::TypeError;
 use rustc_middle::ty::{
-self,AliasRelationDirection,InferConst,MaxUniverse,Term,Ty,TyCtxt,TypeVisitable,
-TypeVisitableExt,TypingMode,
+self,AliasRelationDirection,InferConst,Term,Ty,TyCtxt,TypeSuperVisitable,TypeVisitable,
+TypeVisitableExt,TypeVisitor,TypingMode,
 };
 use rustc_span::Span;
 use tracing::{debug, instrument, warn};
@@ -290,6 +290,45 @@ impl<'tcx> InferCtxt<'tcx> {
 }
 }
 
+/// Finds the max universe present
+structMaxUniverse{
+max_universe: ty::UniverseIndex,
+}
+
+implMaxUniverse{
+fnnew() -> Self{
+MaxUniverse{max_universe: ty::UniverseIndex::ROOT}
+}
+
+fnmax_universe(self) -> ty::UniverseIndex{
+self.max_universe
+}
+}
+
+impl<'tcx>TypeVisitor<TyCtxt<'tcx>>forMaxUniverse{
+fnvisit_ty(&mutself,t:Ty<'tcx>){
+iflet ty::Placeholder(placeholder) = t.kind(){
+self.max_universe = self.max_universe.max(placeholder.universe);
+}
+
+ t.super_visit_with(self)
+}
+
+fnvisit_const(&mutself,c: ty::Const<'tcx>){
+iflet ty::ConstKind::Placeholder(placeholder) = c.kind(){
+self.max_universe = self.max_universe.max(placeholder.universe);
+}
+
+ c.super_visit_with(self)
+}
+
+fnvisit_region(&mutself,r: ty::Region<'tcx>){
+iflet ty::RePlaceholder(placeholder) = r.kind(){
+self.max_universe = self.max_universe.max(placeholder.universe);
+}
+}
+}
+
 /// The "generalizer" is used when handling inference variables.
 ///
 /// The basic strategy for handling a constraint like `?A <: B` is to

compiler/rustc_middle/src/query/mod.rs

@@ -135,7 +135,7 @@ use crate::traits::{
 };
 usecrate::ty::fast_reject::SimplifiedType;
 usecrate::ty::layout::ValidityRequirement;
-usecrate::ty::print::{PrintTraitRefExt, describe_as_module};
+usecrate::ty::print::PrintTraitRefExt;
 usecrate::ty::util::AlwaysRequiresDrop;
 usecrate::ty::{
 self,CrateInherentImpls,GenericArg,GenericArgsRef,PseudoCanonicalInput,SizedTraitKind,Ty,
@@ -2731,3 +2731,12 @@ rustc_queries! {
 
 rustc_with_all_queries!{ define_callbacks! }
 rustc_feedable_queries!{ define_feedable! }
+
+fndescribe_as_module(def_id:implInto<LocalDefId>,tcx:TyCtxt<'_>) -> String{
+let def_id = def_id.into();
+if def_id.is_top_level_module(){
+"top-level module".to_string()
+}else{
+format!("module `{}`", tcx.def_path_str(def_id))
+}
+}

compiler/rustc_middle/src/ty/context.rs

@@ -52,7 +52,7 @@ use rustc_session::{Limit, Session};
 use rustc_span::def_id::{CRATE_DEF_ID,DefPathHash,StableCrateId};
 use rustc_span::{DUMMY_SP,Ident,Span,Symbol, kw, sym};
 use rustc_type_ir::TyKind::*;
-use rustc_type_ir::lang_items::{SolverLangItem,SolverTraitLangItem};
+use rustc_type_ir::lang_items::{SolverAdtLangItem,SolverLangItem,SolverTraitLangItem};
 pubuse rustc_type_ir::lift::Lift;
 use rustc_type_ir::{
 CollectAndApply,Interner,TypeFlags,TypeFoldable,WithCachedTypeInfo, elaborate, search_graph,
@@ -94,6 +94,13 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 typeDefId = DefId;
 typeLocalDefId = LocalDefId;
 typeTraitId = DefId;
+typeForeignId = DefId;
+typeFunctionId = DefId;
+typeClosureId = DefId;
+typeCoroutineClosureId = DefId;
+typeCoroutineId = DefId;
+typeAdtId = DefId;
+typeImplId = DefId;
 typeSpan = Span;
 
 typeGenericArgs = ty::GenericArgsRef<'tcx>;
@@ -492,6 +499,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 self.require_lang_item(solver_trait_lang_item_to_lang_item(lang_item),DUMMY_SP)
 }
 
+fnrequire_adt_lang_item(self,lang_item:SolverAdtLangItem) -> DefId{
+self.require_lang_item(solver_adt_lang_item_to_lang_item(lang_item),DUMMY_SP)
+}
+
 fnis_lang_item(self,def_id:DefId,lang_item:SolverLangItem) -> bool{
 self.is_lang_item(def_id,solver_lang_item_to_lang_item(lang_item))
 }
@@ -500,6 +511,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 self.is_lang_item(def_id,solver_trait_lang_item_to_lang_item(lang_item))
 }
 
+fnis_adt_lang_item(self,def_id:DefId,lang_item:SolverAdtLangItem) -> bool{
+self.is_lang_item(def_id,solver_adt_lang_item_to_lang_item(lang_item))
+}
+
 fnis_default_trait(self,def_id:DefId) -> bool{
 self.is_default_trait(def_id)
 }
@@ -512,6 +527,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 lang_item_to_solver_trait_lang_item(self.lang_items().from_def_id(def_id)?)
 }
 
+fnas_adt_lang_item(self,def_id:DefId) -> Option<SolverAdtLangItem>{
+lang_item_to_solver_adt_lang_item(self.lang_items().from_def_id(def_id)?)
+}
+
 fnassociated_type_def_ids(self,def_id:DefId) -> implIntoIterator<Item = DefId>{
 self.associated_items(def_id)
 .in_definition_order()
@@ -783,6 +802,13 @@ bidirectional_lang_item_map! {
 DynMetadata,
 FutureOutput,
 Metadata,
+// tidy-alphabetical-end
+}
+
+bidirectional_lang_item_map!{
+SolverAdtLangItem, lang_item_to_solver_adt_lang_item, solver_adt_lang_item_to_lang_item;
+
+// tidy-alphabetical-start
 Option,
 Poll,
 // tidy-alphabetical-end

compiler/rustc_middle/src/ty/mod.rs

@@ -109,7 +109,6 @@ pub use self::typeck_results::{
 CanonicalUserType,CanonicalUserTypeAnnotation,CanonicalUserTypeAnnotations,IsIdentity,
 Rust2024IncompatiblePatInfo,TypeckResults,UserType,UserTypeAnnotationIndex,UserTypeKind,
 };
-pubuseself::visit::*;
 usecrate::error::{OpaqueHiddenTypeMismatch,TypeMismatchReason};
 usecrate::metadata::ModChild;
 usecrate::middle::privacy::EffectiveVisibilities;

compiler/rustc_middle/src/ty/predicate.rs

@@ -638,43 +638,15 @@ impl<'tcx> Predicate<'tcx> {
 let predicate = self.kind();
 match predicate.skip_binder(){
 PredicateKind::Clause(ClauseKind::Trait(t)) => Some(predicate.rebind(t)),
-PredicateKind::Clause(ClauseKind::Projection(..))
- | PredicateKind::Clause(ClauseKind::HostEffect(..))
- | PredicateKind::Clause(ClauseKind::ConstArgHasType(..))
- | PredicateKind::Clause(ClauseKind::UnstableFeature(_))
- | PredicateKind::NormalizesTo(..)
- | PredicateKind::AliasRelate(..)
- | PredicateKind::Subtype(..)
- | PredicateKind::Coerce(..)
- | PredicateKind::Clause(ClauseKind::RegionOutlives(..))
- | PredicateKind::Clause(ClauseKind::WellFormed(..))
- | PredicateKind::DynCompatible(..)
- | PredicateKind::Clause(ClauseKind::TypeOutlives(..))
- | PredicateKind::Clause(ClauseKind::ConstEvaluatable(..))
- | PredicateKind::ConstEquate(..)
- | PredicateKind::Ambiguous => None,
+ _ => None,
 }
 }
 
 pubfnas_projection_clause(self) -> Option<PolyProjectionPredicate<'tcx>>{
 let predicate = self.kind();
 match predicate.skip_binder(){
 PredicateKind::Clause(ClauseKind::Projection(t)) => Some(predicate.rebind(t)),
-PredicateKind::Clause(ClauseKind::Trait(..))
- | PredicateKind::Clause(ClauseKind::HostEffect(..))
- | PredicateKind::Clause(ClauseKind::ConstArgHasType(..))
- | PredicateKind::Clause(ClauseKind::UnstableFeature(_))
- | PredicateKind::NormalizesTo(..)
- | PredicateKind::AliasRelate(..)
- | PredicateKind::Subtype(..)
- | PredicateKind::Coerce(..)
- | PredicateKind::Clause(ClauseKind::RegionOutlives(..))
- | PredicateKind::Clause(ClauseKind::WellFormed(..))
- | PredicateKind::DynCompatible(..)
- | PredicateKind::Clause(ClauseKind::TypeOutlives(..))
- | PredicateKind::Clause(ClauseKind::ConstEvaluatable(..))
- | PredicateKind::ConstEquate(..)
- | PredicateKind::Ambiguous => None,
+ _ => None,
 }
 }
 

compiler/rustc_middle/src/ty/print/mod.rs

@@ -2,7 +2,7 @@ use hir::def::Namespace;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sso::SsoHashSet;
 use rustc_hir as hir;
-use rustc_hir::def_id::{CrateNum,DefId,LocalDefId};
+use rustc_hir::def_id::{CrateNum,DefId};
 use rustc_hir::definitions::{DefPathData,DisambiguatedDefPathData};
 use tracing::{debug, instrument, trace};
 
@@ -396,16 +396,6 @@ impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Const<'tcx> {
 }
 }
 
-// This is only used by query descriptions
-pubfndescribe_as_module(def_id:implInto<LocalDefId>,tcx:TyCtxt<'_>) -> String{
-let def_id = def_id.into();
-if def_id.is_top_level_module(){
-"top-level module".to_string()
-}else{
-format!("module `{}`", tcx.def_path_str(def_id))
-}
-}
-
 impl<T> rustc_type_ir::ir_print::IrPrint<T>forTyCtxt<'_>
 where
 T:Copy + for<'a,'tcx>Lift<TyCtxt<'tcx>,Lifted:Print<'tcx,FmtPrinter<'a,'tcx>>>,

compiler/rustc_middle/src/ty/visit.rs

@@ -212,42 +212,3 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for LateBoundRegionsCollector {
 }
 }
 }
-
-/// Finds the max universe present
-pubstructMaxUniverse{
-max_universe: ty::UniverseIndex,
-}
-
-implMaxUniverse{
-pubfnnew() -> Self{
-MaxUniverse{max_universe: ty::UniverseIndex::ROOT}
-}
-
-pubfnmax_universe(self) -> ty::UniverseIndex{
-self.max_universe
-}
-}
-
-impl<'tcx>TypeVisitor<TyCtxt<'tcx>>forMaxUniverse{
-fnvisit_ty(&mutself,t:Ty<'tcx>){
-iflet ty::Placeholder(placeholder) = t.kind(){
-self.max_universe = self.max_universe.max(placeholder.universe);
-}
-
- t.super_visit_with(self)
-}
-
-fnvisit_const(&mutself,c: ty::consts::Const<'tcx>){
-iflet ty::ConstKind::Placeholder(placeholder) = c.kind(){
-self.max_universe = self.max_universe.max(placeholder.universe);
-}
-
- c.super_visit_with(self)
-}
-
-fnvisit_region(&mutself,r: ty::Region<'tcx>){
-iflet ty::RePlaceholder(placeholder) = r.kind(){
-self.max_universe = self.max_universe.max(placeholder.universe);
-}
-}
-}

compiler/rustc_mir_transform/src/gvn.rs

@@ -1644,6 +1644,11 @@ impl<'tcx> VnState<'_, 'tcx> {
 let place =
 Place{ local,projection:self.tcx.mk_place_elems(projection.as_slice())};
 returnSome(place);
+}elseif projection.last() == Some(&PlaceElem::Deref){
+// `Deref` can only be the first projection in a place.
+// If we are here, we failed to find a local, and we already have a `Deref`.
+// Trying to add projections will only result in an ill-formed place.
+returnNone;
 }elseifletValue::Projection(pointer, proj) = *self.get(index)
  && (allow_complex_projection || proj.is_stable_offset())
  && letSome(proj) = self.try_as_place_elem(self.ty(index), proj, loc)

compiler/rustc_next_trait_solver/src/coherence.rs

@@ -435,7 +435,21 @@ where
 }
 }
  ty::Error(_) => ControlFlow::Break(OrphanCheckEarlyExit::LocalTy(ty)),
- ty::Closure(did, ..) | ty::CoroutineClosure(did, ..) | ty::Coroutine(did, ..) => {
+ ty::Closure(did, ..) => {
+ifself.def_id_is_local(did){
+ControlFlow::Break(OrphanCheckEarlyExit::LocalTy(ty))
+}else{
+self.found_non_local_ty(ty)
+}
+}
+ ty::CoroutineClosure(did, ..) => {
+ifself.def_id_is_local(did){
+ControlFlow::Break(OrphanCheckEarlyExit::LocalTy(ty))
+}else{
+self.found_non_local_ty(ty)
+}
+}
+ ty::Coroutine(did, ..) => {
 ifself.def_id_is_local(did){
 ControlFlow::Break(OrphanCheckEarlyExit::LocalTy(ty))
 }else{