Rollup merge of #146313 - nnethercote:rustc_middle-ty-cleanups-2, r=lcnr

Some `rustc_middle` cleanups
Minor improvements I found while looking through this code.
r? `@BoxyUwU`

Author: matthiaskrgr

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/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);
-}
-}
-}