Give EarlyBinder a tcx parameter

We are gonna need it to uplift EarlyBinder

Author: compiler-errors

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

@@ -449,7 +449,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for RemapLateBound<'_, 'tcx> {
 pub(super)fncollect_return_position_impl_trait_in_trait_tys<'tcx>(
 tcx:TyCtxt<'tcx>,
 impl_m_def_id:LocalDefId,
-) -> Result<&'tcxDefIdMap<ty::EarlyBinder<Ty<'tcx>>>,ErrorGuaranteed>{
+) -> Result<&'tcxDefIdMap<ty::EarlyBinder<'tcx,Ty<'tcx>>>,ErrorGuaranteed>{
 let impl_m = tcx.opt_associated_item(impl_m_def_id.to_def_id()).unwrap();
 let trait_m = tcx.opt_associated_item(impl_m.trait_item_def_id.unwrap()).unwrap();
 let impl_trait_ref =

compiler/rustc_hir_analysis/src/collect.rs

@@ -1278,7 +1278,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::TraitDef {
 }
 
 #[instrument(level = "debug", skip(tcx))]
-fnfn_sig(tcx:TyCtxt<'_>,def_id:LocalDefId) -> ty::EarlyBinder<ty::PolyFnSig<'_>>{
+fnfn_sig(tcx:TyCtxt<'_>,def_id:LocalDefId) -> ty::EarlyBinder<'_,ty::PolyFnSig<'_>>{
 use rustc_hir::Node::*;
 use rustc_hir::*;
 

compiler/rustc_hir_analysis/src/collect/item_bounds.rs

@@ -82,22 +82,22 @@ fn opaque_type_bounds<'tcx>(
 pub(super)fnexplicit_item_bounds(
 tcx:TyCtxt<'_>,
 def_id:LocalDefId,
-) -> ty::EarlyBinder<&'_[(ty::Clause<'_>,Span)]>{
+) -> ty::EarlyBinder<'_,&'_[(ty::Clause<'_>,Span)]>{
 explicit_item_bounds_with_filter(tcx, def_id,PredicateFilter::All)
 }
 
 pub(super)fnexplicit_item_super_predicates(
 tcx:TyCtxt<'_>,
 def_id:LocalDefId,
-) -> ty::EarlyBinder<&'_[(ty::Clause<'_>,Span)]>{
+) -> ty::EarlyBinder<'_,&'_[(ty::Clause<'_>,Span)]>{
 explicit_item_bounds_with_filter(tcx, def_id,PredicateFilter::SelfOnly)
 }
 
 pub(super)fnexplicit_item_bounds_with_filter(
 tcx:TyCtxt<'_>,
 def_id:LocalDefId,
 filter:PredicateFilter,
-) -> ty::EarlyBinder<&'_[(ty::Clause<'_>,Span)]>{
+) -> ty::EarlyBinder<'_,&'_[(ty::Clause<'_>,Span)]>{
 match tcx.opt_rpitit_info(def_id.to_def_id()){
 // RPITIT's bounds are the same as opaque type bounds, but with
 // a projection self type.
@@ -166,7 +166,7 @@ pub(super) fn explicit_item_bounds_with_filter(
  ty::EarlyBinder::bind(bounds)
 }
 
-pub(super)fnitem_bounds(tcx:TyCtxt<'_>,def_id:DefId) -> ty::EarlyBinder<ty::Clauses<'_>>{
+pub(super)fnitem_bounds(tcx:TyCtxt<'_>,def_id:DefId) -> ty::EarlyBinder<'_,ty::Clauses<'_>>{
  tcx.explicit_item_bounds(def_id).map_bound(|bounds| {
  tcx.mk_clauses_from_iter(util::elaborate(tcx, bounds.iter().map(|&(bound, _span)| bound)))
 })
@@ -175,7 +175,7 @@ pub(super) fn item_bounds(tcx: TyCtxt<'_>, def_id: DefId) -> ty::EarlyBinder<ty:
 pub(super)fnitem_super_predicates(
 tcx:TyCtxt<'_>,
 def_id:DefId,
-) -> ty::EarlyBinder<ty::Clauses<'_>>{
+) -> ty::EarlyBinder<'_,ty::Clauses<'_>>{
  tcx.explicit_item_super_predicates(def_id).map_bound(|bounds| {
  tcx.mk_clauses_from_iter(
  util::elaborate(tcx, bounds.iter().map(|&(bound, _span)| bound)).filter_only_self(),
@@ -186,7 +186,7 @@ pub(super) fn item_super_predicates(
 pub(super)fnitem_non_self_assumptions(
 tcx:TyCtxt<'_>,
 def_id:DefId,
-) -> ty::EarlyBinder<ty::Clauses<'_>>{
+) -> ty::EarlyBinder<'_,ty::Clauses<'_>>{
 let all_bounds:FxIndexSet<_> = tcx.item_bounds(def_id).skip_binder().iter().collect();
 let own_bounds:FxIndexSet<_> =
  tcx.item_super_predicates(def_id).skip_binder().iter().collect();

compiler/rustc_hir_analysis/src/collect/type_of.rs

@@ -309,7 +309,7 @@ fn get_path_containing_arg_in_pat<'hir>(
  arg_path
 }
 
-pub(super)fntype_of(tcx:TyCtxt<'_>,def_id:LocalDefId) -> ty::EarlyBinder<Ty<'_>>{
+pub(super)fntype_of(tcx:TyCtxt<'_>,def_id:LocalDefId) -> ty::EarlyBinder<'_,Ty<'_>>{
 use rustc_hir::*;
 use rustc_middle::ty::Ty;
 
@@ -512,7 +512,7 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::EarlyBinder<Ty
 pub(super)fntype_of_opaque(
 tcx:TyCtxt<'_>,
 def_id:DefId,
-) -> Result<ty::EarlyBinder<Ty<'_>>,CyclePlaceholder>{
+) -> Result<ty::EarlyBinder<'_,Ty<'_>>,CyclePlaceholder>{
 ifletSome(def_id) = def_id.as_local(){
 use rustc_hir::*;
 

compiler/rustc_hir_analysis/src/outlives/explicit.rs

@@ -6,7 +6,7 @@ use super::utils::*;
 
 #[derive(Debug)]
 pubstructExplicitPredicatesMap<'tcx>{
-map:FxIndexMap<DefId, ty::EarlyBinder<RequiredPredicates<'tcx>>>,
+map:FxIndexMap<DefId, ty::EarlyBinder<'tcx,RequiredPredicates<'tcx>>>,
 }
 
 impl<'tcx>ExplicitPredicatesMap<'tcx>{
@@ -18,7 +18,7 @@ impl<'tcx> ExplicitPredicatesMap<'tcx> {
 &mutself,
 tcx:TyCtxt<'tcx>,
 def_id:DefId,
-) -> &ty::EarlyBinder<RequiredPredicates<'tcx>>{
+) -> &ty::EarlyBinder<'tcx,RequiredPredicates<'tcx>>{
 self.map.entry(def_id).or_insert_with(|| {
 let predicates = if def_id.is_local(){
  tcx.explicit_predicates_of(def_id)

compiler/rustc_hir_analysis/src/outlives/implicit_infer.rs

@@ -15,7 +15,7 @@ use super::utils::*;
 /// now be filled with inferred predicates.
 pub(super)fninfer_predicates(
 tcx:TyCtxt<'_>,
-) -> FxIndexMap<DefId, ty::EarlyBinder<RequiredPredicates<'_>>>{
+) -> FxIndexMap<DefId, ty::EarlyBinder<'_,RequiredPredicates<'_>>>{
 debug!("infer_predicates");
 
 letmut explicit_map = ExplicitPredicatesMap::new();
@@ -101,7 +101,7 @@ fn insert_required_predicates_to_be_wf<'tcx>(
 tcx:TyCtxt<'tcx>,
 ty:Ty<'tcx>,
 span:Span,
-global_inferred_outlives:&FxIndexMap<DefId, ty::EarlyBinder<RequiredPredicates<'tcx>>>,
+global_inferred_outlives:&FxIndexMap<DefId, ty::EarlyBinder<'tcx,RequiredPredicates<'tcx>>>,
 required_predicates:&mutRequiredPredicates<'tcx>,
 explicit_map:&mutExplicitPredicatesMap<'tcx>,
 ){
@@ -322,7 +322,7 @@ fn check_inferred_predicates<'tcx>(
 tcx:TyCtxt<'tcx>,
 def_id:DefId,
 args: ty::GenericArgsRef<'tcx>,
-global_inferred_outlives:&FxIndexMap<DefId, ty::EarlyBinder<RequiredPredicates<'tcx>>>,
+global_inferred_outlives:&FxIndexMap<DefId, ty::EarlyBinder<'tcx,RequiredPredicates<'tcx>>>,
 required_predicates:&mutRequiredPredicates<'tcx>,
 ){
 // Load the current set of inferred and explicit predicates from `global_inferred_outlives`

compiler/rustc_lint/src/non_local_def.rs

@@ -270,7 +270,7 @@ fn impl_trait_ref_has_enough_non_local_candidates<'tcx>(
 tcx:TyCtxt<'tcx>,
 infer_span:Span,
 trait_def_id:DefId,
-binder:EarlyBinder<TraitRef<'tcx>>,
+binder:EarlyBinder<'tcx,TraitRef<'tcx>>,
 mutdid_has_local_parent:implFnMut(DefId) -> bool,
 ) -> bool{
 let infcx = tcx

compiler/rustc_metadata/src/rmeta/decoder.rs

@@ -1074,7 +1074,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
 self,
 index:DefIndex,
 tcx:TyCtxt<'tcx>,
-) -> ty::EarlyBinder<&'tcx[(ty::Clause<'tcx>,Span)]>{
+) -> ty::EarlyBinder<'tcx,&'tcx[(ty::Clause<'tcx>,Span)]>{
 let lazy = self.root.tables.explicit_item_bounds.get(self, index);
 let output = if lazy.is_default(){
 &mut[]
@@ -1088,7 +1088,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
 self,
 index:DefIndex,
 tcx:TyCtxt<'tcx>,
-) -> ty::EarlyBinder<&'tcx[(ty::Clause<'tcx>,Span)]>{
+) -> ty::EarlyBinder<'tcx,&'tcx[(ty::Clause<'tcx>,Span)]>{
 let lazy = self.root.tables.explicit_item_super_predicates.get(self, index);
 let output = if lazy.is_default(){
 &mut[]

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -418,19 +418,19 @@ define_tables! {
 // As an optimization, we only store this for trait aliases,
 // since it's identical to super_predicates_of for traits.
  implied_predicates_of:Table<DefIndex,LazyValue<ty::GenericPredicates<'static>>>,
- type_of:Table<DefIndex,LazyValue<ty::EarlyBinder<Ty<'static>>>>,
+ type_of:Table<DefIndex,LazyValue<ty::EarlyBinder<'static,Ty<'static>>>>,
  variances_of:Table<DefIndex,LazyArray<ty::Variance>>,
- fn_sig:Table<DefIndex,LazyValue<ty::EarlyBinder<ty::PolyFnSig<'static>>>>,
+ fn_sig:Table<DefIndex,LazyValue<ty::EarlyBinder<'static,ty::PolyFnSig<'static>>>>,
  codegen_fn_attrs:Table<DefIndex,LazyValue<CodegenFnAttrs>>,
  impl_trait_header:Table<DefIndex,LazyValue<ty::ImplTraitHeader<'static>>>,
- const_param_default:Table<DefIndex,LazyValue<ty::EarlyBinder<rustc_middle::ty::Const<'static>>>>,
+ const_param_default:Table<DefIndex,LazyValue<ty::EarlyBinder<'static,rustc_middle::ty::Const<'static>>>>,
  object_lifetime_default:Table<DefIndex,LazyValue<ObjectLifetimeDefault>>,
  optimized_mir:Table<DefIndex,LazyValue<mir::Body<'static>>>,
  mir_for_ctfe:Table<DefIndex,LazyValue<mir::Body<'static>>>,
  closure_saved_names_of_captured_variables:Table<DefIndex,LazyValue<IndexVec<FieldIdx,Symbol>>>,
  mir_coroutine_witnesses:Table<DefIndex,LazyValue<mir::CoroutineLayout<'static>>>,
  promoted_mir:Table<DefIndex,LazyValue<IndexVec<mir::Promoted, mir::Body<'static>>>>,
- thir_abstract_const:Table<DefIndex,LazyValue<ty::EarlyBinder<ty::Const<'static>>>>,
+ thir_abstract_const:Table<DefIndex,LazyValue<ty::EarlyBinder<'static,ty::Const<'static>>>>,
  impl_parent:Table<DefIndex,RawDefId>,
  constness:Table<DefIndex, hir::Constness>,
  defaultness:Table<DefIndex, hir::Defaultness>,
@@ -459,7 +459,7 @@ define_tables! {
  macro_definition:Table<DefIndex,LazyValue<ast::DelimArgs>>,
  proc_macro:Table<DefIndex,MacroKind>,
  deduced_param_attrs:Table<DefIndex,LazyArray<DeducedParamAttrs>>,
- trait_impl_trait_tys:Table<DefIndex,LazyValue<DefIdMap<ty::EarlyBinder<Ty<'static>>>>>,
+ trait_impl_trait_tys:Table<DefIndex,LazyValue<DefIdMap<ty::EarlyBinder<'static,Ty<'static>>>>>,
  doc_link_resolutions:Table<DefIndex,LazyValue<DocLinkResMap>>,
  doc_link_traits_in_scope:Table<DefIndex,LazyArray<DefId>>,
  assumed_wf_types_for_rpitit:Table<DefIndex,LazyArray<(Ty<'static>,Span)>>,

compiler/rustc_middle/src/arena.rs

@@ -108,7 +108,7 @@ macro_rules! arena_types {
 [decode] trait_impl_trait_tys:
  rustc_data_structures::unord::UnordMap<
  rustc_hir::def_id::DefId,
- rustc_middle::ty::EarlyBinder<rustc_middle::ty::Ty<'tcx>>
+ rustc_middle::ty::EarlyBinder<'tcx,rustc_middle::ty::Ty<'tcx>>
  >,
 [] external_constraints: rustc_middle::traits::solve::ExternalConstraintsData<'tcx>,
 [] predefined_opaques_in_body: rustc_middle::traits::solve::PredefinedOpaquesData<'tcx>,