A bunch more errors fixed

Author: Jamesbarford

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -368,7 +368,7 @@ impl<'a, 'tcx> Encodable<EncodeContext<'a, 'tcx>> for [u8] {
     }
 }
 
-impl<'a, 'tcx> rustc_type_ir::codec::TyEncoder<'tcx> for EncodeContext<'a, 'tcx> {
+impl<'a, 'tcx> rustc_middle::ty::TyEncoder<'tcx> for EncodeContext<'a, 'tcx> {
     type Interner = TyCtxt<'tcx>;
 
     const CLEAR_CROSS_CRATE: bool = true;

compiler/rustc_middle/src/ty/context/impl_interner.rs

@@ -877,10 +877,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 
     fn struct_tail_raw(
         self,
-        mut ty: Ty<'tcx>,
+        ty: Ty<'tcx>,
         cause: &ObligationCause<'tcx>,
-        mut normalize: impl FnMut(Ty<'tcx>) -> Ty<'tcx>,
-        mut f: impl FnMut() -> (),
+        normalize: impl FnMut(Ty<'tcx>) -> Ty<'tcx>,
+        f: impl FnMut() -> (),
     ) -> Ty<'tcx> {
         self.struct_tail_raw(ty, cause, normalize, f)
     }

compiler/rustc_middle/src/ty/error.rs

@@ -121,7 +121,7 @@ impl<'tcx> TypeError<'tcx> {
     }
 }
 
-trait TyErrorHelpers<'tcx> {
+pub trait TyErrorHelpers<'tcx> {
     fn sort_string(self, tcx: TyCtxt<'tcx>) -> Cow<'static, str>;
     fn prefix_string(self, tcx: TyCtxt<'_>) -> Cow<'static, str>;
 }

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

@@ -97,7 +97,7 @@ impl<'tcx> VariantDef {
     }
 }
 
-trait TyInhabitedHelpers<'tcx> {
+pub trait TyInhabitedHelpers<'tcx> {
     fn inhabited_predicate(self, tcx: TyCtxt<'tcx>) -> InhabitedPredicate<'tcx>;
     fn is_inhabited_from(
         self,

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

@@ -17,7 +17,6 @@ use rustc_hir::limit::Limit;
 use rustc_macros::{Lift, extension};
 use rustc_session::cstore::{ExternCrate, ExternCrateSource};
 use rustc_span::{Ident, RemapPathScopeComponents, Symbol, kw, sym};
-use rustc_type_ir::inherent::GenericArgs as _;
 use rustc_type_ir::{FieldInfo, Upcast as _, elaborate};
 use smallvec::SmallVec;
 

compiler/rustc_middle/src/ty/sty.rs

@@ -10,15 +10,11 @@ use rustc_hir::def_id::DefId;
 use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, extension};
 use rustc_span::{Span, Symbol, kw};
 use rustc_type_ir::TyKind::*;
-use rustc_type_ir::{self as ir, CollectAndApply, TypeVisitableExt};
+use rustc_type_ir::{self as ir, TypeVisitableExt};
 use tracing::instrument;
-use ty::util::IntTypeExt;
 
 use crate::infer::canonical::Canonical;
-use crate::ty::{
-    self, Discr, GenericArg, GenericArgsRef, List, ParamEnv, TyCtxt, TypeSuperVisitable,
-    TypeVisitable, TypeVisitor,
-};
+use crate::ty::{self, Discr, GenericArg, GenericArgsRef, List, ParamEnv, TyCtxt, TypeVisitable};
 
 // Re-export and re-parameterize some `I = TyCtxt<'tcx>` types here
 #[rustc_diagnostic_item = "TyKind"]
@@ -39,6 +35,7 @@ pub type BoundRegion<'tcx> = ir::BoundRegion<TyCtxt<'tcx>>;
 pub type BoundVariableKind<'tcx> = ir::BoundVariableKind<TyCtxt<'tcx>>;
 pub type BoundRegionKind<'tcx> = ir::BoundRegionKind<TyCtxt<'tcx>>;
 pub type BoundTyKind<'tcx> = ir::BoundTyKind<TyCtxt<'tcx>>;
+#[allow(rustc::usage_of_qualified_ty)]
 pub type Ty<'tcx> = ir::Ty<TyCtxt<'tcx>>;
 
 pub trait Article {

compiler/rustc_monomorphize/src/collector.rs

@@ -227,6 +227,7 @@ use rustc_middle::mir::{self, Body, Location, MentionedItem, traversal};
 use rustc_middle::query::TyCtxtAt;
 use rustc_middle::ty::adjustment::{CustomCoerceUnsized, PointerCoercion};
 use rustc_middle::ty::layout::ValidityRequirement;
+use rustc_middle::ty::util::TyUtil;
 use rustc_middle::ty::{
     self, GenericArgs, GenericParamDefKind, Instance, InstanceKind, Ty, TyCtxt, TypeFoldable,
     TypeVisitable, TypeVisitableExt, TypeVisitor, VtblEntry,

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -9,7 +9,9 @@ use rustc_hir::def_id::DefId;
 use rustc_index::{Idx, IndexVec};
 use rustc_middle::middle::stability::EvalResult;
 use rustc_middle::thir::{self, Pat, PatKind, PatRange, PatRangeBoundary};
+use rustc_middle::ty::inhabitedness::TyInhabitedHelpers;
 use rustc_middle::ty::layout::IntegerExt;
+use rustc_middle::ty::util::TyUtil;
 use rustc_middle::ty::{
     self, FieldDef, OpaqueTypeKey, ScalarInt, Ty, TyCtxt, TypeVisitableExt, VariantDef,
 };

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

@@ -62,7 +62,7 @@ use rustc_infer::infer::DefineOpaqueTypes;
 use rustc_macros::extension;
 use rustc_middle::bug;
 use rustc_middle::traits::PatternOriginExpr;
-use rustc_middle::ty::error::{ExpectedFound, TypeError, TypeErrorToStringExt};
+use rustc_middle::ty::error::{ExpectedFound, TyErrorHelpers, TypeError, TypeErrorToStringExt};
 use rustc_middle::ty::print::{PrintTraitRefExt as _, WrapBinderMode, with_forced_trimmed_paths};
 use rustc_middle::ty::{
     self, List, ParamEnv, Region, Ty, TyCtxt, TypeFoldable, TypeSuperVisitable, TypeVisitable,

compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs

@@ -13,6 +13,7 @@ use rustc_hir::{
 use rustc_middle::bug;
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, DerefAdjustKind};
+use rustc_middle::ty::error::TyErrorHelpers;
 use rustc_middle::ty::print::{FmtPrinter, PrettyPrinter, Print, Printer};
 use rustc_middle::ty::{
     self, GenericArg, GenericArgKind, GenericArgsRef, InferConst, IsSuggestable, Term, TermKind,