Reduce visibilities some more.

It helps people reading the code understand how widely things are used.

Author: nnethercote

compiler/rustc_infer/src/infer/mod.rs

@@ -14,7 +14,8 @@ use region_constraints::{
 GenericKind,RegionConstraintCollector,RegionConstraintStorage,VarInfos,VerifyBound,
 };
 pubuse relate::StructurallyRelateAliases;
-pubuse relate::combine::{CombineFields,PredicateEmittingRelation};
+use relate::combine::CombineFields;
+pubuse relate::combine::PredicateEmittingRelation;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::{FxHashSet,FxIndexMap};
 use rustc_data_structures::sync::Lrc;
@@ -75,7 +76,7 @@ pub struct InferOk<'tcx, T> {
 }
 pubtypeInferResult<'tcx,T> = Result<InferOk<'tcx,T>,TypeError<'tcx>>;
 
-pubtypeFixupResult<T> = Result<T,FixupError>;// "fixup result"
+pub(crate)typeFixupResult<T> = Result<T,FixupError>;// "fixup result"
 
 pub(crate)typeUnificationTable<'a,'tcx,T> = ut::UnificationTable<
  ut::InPlace<T,&'amut ut::UnificationStorage<T>,&'amutInferCtxtUndoLogs<'tcx>>,
@@ -200,7 +201,7 @@ impl<'tcx> InferCtxtInner<'tcx> {
 }
 
 #[inline]
-pubfnopaque_types(&mutself) -> opaque_types::OpaqueTypeTable<'_,'tcx>{
+fnopaque_types(&mutself) -> opaque_types::OpaqueTypeTable<'_,'tcx>{
 self.opaque_type_storage.with_log(&mutself.undo_log)
 }
 
@@ -1351,7 +1352,7 @@ impl<'tcx> InferCtxt<'tcx> {
 }
 
 /// See the [`region_constraints::RegionConstraintCollector::verify_generic_bound`] method.
-pubfnverify_generic_bound(
+pub(crate)fnverify_generic_bound(
 &self,
 origin:SubregionOrigin<'tcx>,
 kind:GenericKind<'tcx>,

compiler/rustc_infer/src/infer/opaque_types/table.rs

@@ -46,7 +46,7 @@ impl<'tcx> Drop for OpaqueTypeStorage<'tcx> {
 }
 }
 
-pubstructOpaqueTypeTable<'a,'tcx>{
+pub(crate)structOpaqueTypeTable<'a,'tcx>{
 storage:&'amutOpaqueTypeStorage<'tcx>,
 
 undo_log:&'amutInferCtxtUndoLogs<'tcx>,

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

@@ -14,7 +14,7 @@ pub mod env;
 pubmod for_liveness;
 pubmod obligations;
 pubmod test_type_match;
-pubmod verify;
+pub(crate)mod verify;
 
 #[instrument(level = "debug", skip(param_env), ret)]
 pubfnexplicit_outlives_bounds<'tcx>(

compiler/rustc_infer/src/infer/outlives/verify.rs

@@ -15,7 +15,7 @@ use crate::infer::{GenericKind, VerifyBound};
 /// via a "delegate" of type `D` -- this is usually the `infcx`, which
 /// accrues them into the `region_obligations` code, but for NLL we
 /// use something else.
-pubstructVerifyBoundCx<'cx,'tcx>{
+pub(crate)structVerifyBoundCx<'cx,'tcx>{
 tcx:TyCtxt<'tcx>,
 region_bound_pairs:&'cxRegionBoundPairs<'tcx>,
 /// During borrowck, if there are no outlives bounds on a generic
@@ -28,7 +28,7 @@ pub struct VerifyBoundCx<'cx, 'tcx> {
 }
 
 impl<'cx,'tcx>VerifyBoundCx<'cx,'tcx>{
-pubfnnew(
+pub(crate)fnnew(
 tcx:TyCtxt<'tcx>,
 region_bound_pairs:&'cxRegionBoundPairs<'tcx>,
 implicit_region_bound:Option<ty::Region<'tcx>>,
@@ -38,7 +38,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
 }
 
 #[instrument(level = "debug", skip(self))]
-pubfnparam_or_placeholder_bound(&self,ty:Ty<'tcx>) -> VerifyBound<'tcx>{
+pub(crate)fnparam_or_placeholder_bound(&self,ty:Ty<'tcx>) -> VerifyBound<'tcx>{
 // Start with anything like `T: 'a` we can scrape from the
 // environment. If the environment contains something like
 // `for<'a> T: 'a`, then we know that `T` outlives everything.
@@ -92,7 +92,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
 /// the clause from the environment only applies if `'0 = 'a`,
 /// which we don't know yet. But we would still include `'b` in
 /// this list.
-pubfnapprox_declared_bounds_from_env(
+pub(crate)fnapprox_declared_bounds_from_env(
 &self,
 alias_ty: ty::AliasTy<'tcx>,
 ) -> Vec<ty::PolyTypeOutlivesPredicate<'tcx>>{
@@ -101,7 +101,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
 }
 
 #[instrument(level = "debug", skip(self))]
-pubfnalias_bound(&self,alias_ty: ty::AliasTy<'tcx>) -> VerifyBound<'tcx>{
+pub(crate)fnalias_bound(&self,alias_ty: ty::AliasTy<'tcx>) -> VerifyBound<'tcx>{
 let alias_ty_as_ty = alias_ty.to_ty(self.tcx);
 
 // Search the env for where clauses like `P: 'a`.
@@ -285,7 +285,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
 ///
 /// This is for simplicity, and because we are not really smart
 /// enough to cope with such bounds anywhere.
-pubfndeclared_bounds_from_definition(
+pub(crate)fndeclared_bounds_from_definition(
 &self,
 alias_ty: ty::AliasTy<'tcx>,
 ) -> implIterator<Item = ty::Region<'tcx>>{

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

@@ -304,7 +304,7 @@ pub struct RegionVariableInfo {
 pubuniverse: ty::UniverseIndex,
 }
 
-pubstructRegionSnapshot{
+pub(crate)structRegionSnapshot{
 any_unifications:bool,
 }
 

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

@@ -33,7 +33,7 @@ use crate::infer::{DefineOpaqueTypes, InferCtxt, TypeTrace, relate};
 usecrate::traits::{Obligation,PredicateObligation};
 
 #[derive(Clone)]
-pubstructCombineFields<'infcx,'tcx>{
+pub(crate)structCombineFields<'infcx,'tcx>{
 pubinfcx:&'infcxInferCtxt<'tcx>,
 // Immutable fields
 pubtrace:TypeTrace<'tcx>,
@@ -47,7 +47,7 @@ pub struct CombineFields<'infcx, 'tcx> {
 }
 
 impl<'infcx,'tcx>CombineFields<'infcx,'tcx>{
-pubfnnew(
+pub(crate)fnnew(
 infcx:&'infcxInferCtxt<'tcx>,
 trace:TypeTrace<'tcx>,
 param_env: ty::ParamEnv<'tcx>,
@@ -283,22 +283,22 @@ impl<'tcx> InferCtxt<'tcx> {
 }
 
 impl<'infcx,'tcx>CombineFields<'infcx,'tcx>{
-pubfntcx(&self) -> TyCtxt<'tcx>{
+pub(crate)fntcx(&self) -> TyCtxt<'tcx>{
 self.infcx.tcx
 }
 
-pubfnequate<'a>(
+pub(crate)fnequate<'a>(
 &'amutself,
 structurally_relate_aliases:StructurallyRelateAliases,
 ) -> TypeRelating<'a,'infcx,'tcx>{
 TypeRelating::new(self, structurally_relate_aliases, ty::Invariant)
 }
 
-pubfnsub<'a>(&'amutself) -> TypeRelating<'a,'infcx,'tcx>{
+pub(crate)fnsub<'a>(&'amutself) -> TypeRelating<'a,'infcx,'tcx>{
 TypeRelating::new(self,StructurallyRelateAliases::No, ty::Covariant)
 }
 
-pubfnsup<'a>(&'amutself) -> TypeRelating<'a,'infcx,'tcx>{
+pub(crate)fnsup<'a>(&'amutself) -> TypeRelating<'a,'infcx,'tcx>{
 TypeRelating::new(self,StructurallyRelateAliases::No, ty::Contravariant)
 }
 
@@ -310,14 +310,14 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
 LatticeOp::new(self,LatticeOpKind::Glb)
 }
 
-pubfnregister_obligations(
+pub(crate)fnregister_obligations(
 &mutself,
 obligations:implIntoIterator<Item = Goal<'tcx, ty::Predicate<'tcx>>>,
 ){
 self.goals.extend(obligations);
 }
 
-pubfnregister_predicates(
+pub(crate)fnregister_predicates(
 &mutself,
 obligations:implIntoIterator<Item:Upcast<TyCtxt<'tcx>, ty::Predicate<'tcx>>>,
 ){

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

@@ -5,7 +5,7 @@
 pubuse rustc_middle::ty::relate::RelateResult;
 pubuse rustc_next_trait_solver::relate::*;
 
-pubuseself::combine::{CombineFields,PredicateEmittingRelation};
+pubuseself::combine::PredicateEmittingRelation;
 
 #[allow(hidden_glob_reexports)]
 pub(super)mod combine;

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

@@ -13,7 +13,7 @@ use crate::infer::relate::{PredicateEmittingRelation, StructurallyRelateAliases}
 usecrate::infer::{DefineOpaqueTypes,InferCtxt,SubregionOrigin};
 
 /// Enforce that `a` is equal to or a subtype of `b`.
-pubstructTypeRelating<'combine,'a,'tcx>{
+pub(crate)structTypeRelating<'combine,'a,'tcx>{
 // Immutable except for the `InferCtxt` and the
 // resulting nested `goals`.
 fields:&'combinemutCombineFields<'a,'tcx>,
@@ -49,7 +49,7 @@ pub struct TypeRelating<'combine, 'a, 'tcx> {
 }
 
 impl<'combine,'infcx,'tcx>TypeRelating<'combine,'infcx,'tcx>{
-pubfnnew(
+pub(crate)fnnew(
 f:&'combinemutCombineFields<'infcx,'tcx>,
 structurally_relate_aliases:StructurallyRelateAliases,
 ambient_variance: ty::Variance,

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

@@ -5,7 +5,7 @@ use tracing::{debug, instrument};
 usesuper::InferCtxt;
 usesuper::region_constraints::RegionSnapshot;
 
-mod fudge;
+pub(crate)mod fudge;
 pub(crate)mod undo_log;
 
 use undo_log::{Snapshot,UndoLog};