Skip to content

Commit e670844

Browse files
committed
Auto merge of #91929 - anuvratsingh:remove_in_band_lifetimes_compiler_rustc_traits, r=jackh726
Removed `in_band_lifetimes` from `rustc_traits` Issue: [#91867](#91867)
2 parents 8baeddf + 58a888f commit e670844

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

compiler/rustc_traits/src/chalk/db.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ impl<'tcx> chalk_ir::UnificationDatabase<RustInterner<'tcx>> for RustIrDatabase<
724724
/// var bound at index `0`. For types, we use a `BoundVar` index equal to
725725
/// the type parameter index. For regions, we use the `BoundRegionKind::BrNamed`
726726
/// variant (which has a `DefId`).
727-
fn bound_vars_for_item(tcx: TyCtxt<'tcx>, def_id: DefId) -> SubstsRef<'tcx> {
727+
fn bound_vars_for_item<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> SubstsRef<'tcx> {
728728
InternalSubsts::for_item(tcx, def_id, |param, substs| match param.kind {
729729
ty::GenericParamDefKind::Type { .. } => tcx
730730
.mk_ty(ty::Bound(

compiler/rustc_traits/src/implied_outlives_bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fn compute_implied_outlives_bounds<'tcx>(
138138
/// this down to determine what relationships would have to hold for
139139
/// `T: 'a` to hold. We get to assume that the caller has validated
140140
/// those relationships.
141-
fn implied_bounds_from_components(
141+
fn implied_bounds_from_components<'tcx>(
142142
sub_region: ty::Region<'tcx>,
143143
sup_components: SmallVec<[Component<'tcx>; 4]>,
144144
) -> Vec<OutlivesBound<'tcx>> {

compiler/rustc_traits/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//! the guts are broken up into modules; see the comments in those modules.
33
44
#![feature(crate_visibility_modifier)]
5-
#![feature(in_band_lifetimes)]
65
#![feature(nll)]
76
#![recursion_limit = "256"]
87

compiler/rustc_traits/src/normalize_erasing_regions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn try_normalize_after_erasing_regions<'tcx, T: TypeFoldable<'tcx> + PartialEq +
5757
})
5858
}
5959

60-
fn not_outlives_predicate(p: &ty::Predicate<'tcx>) -> bool {
60+
fn not_outlives_predicate<'tcx>(p: &ty::Predicate<'tcx>) -> bool {
6161
match p.kind().skip_binder() {
6262
ty::PredicateKind::RegionOutlives(..) | ty::PredicateKind::TypeOutlives(..) => false,
6363
ty::PredicateKind::Trait(..)

compiler/rustc_traits/src/type_op.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct AscribeUserTypeCx<'me, 'tcx> {
7070
fulfill_cx: &'me mut dyn TraitEngine<'tcx>,
7171
}
7272

73-
impl AscribeUserTypeCx<'me, 'tcx> {
73+
impl<'me, 'tcx> AscribeUserTypeCx<'me, 'tcx> {
7474
fn normalize<T>(&mut self, value: T) -> T
7575
where
7676
T: TypeFoldable<'tcx>,
@@ -195,7 +195,7 @@ fn type_op_eq<'tcx>(
195195
})
196196
}
197197

198-
fn type_op_normalize<T>(
198+
fn type_op_normalize<'tcx, T>(
199199
infcx: &InferCtxt<'_, 'tcx>,
200200
fulfill_cx: &mut dyn TraitEngine<'tcx>,
201201
key: ParamEnvAnd<'tcx, Normalize<T>>,
@@ -210,28 +210,28 @@ where
210210
Ok(value)
211211
}
212212

213-
fn type_op_normalize_ty(
213+
fn type_op_normalize_ty<'tcx>(
214214
tcx: TyCtxt<'tcx>,
215215
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<Ty<'tcx>>>>,
216216
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>, NoSolution> {
217217
tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, type_op_normalize)
218218
}
219219

220-
fn type_op_normalize_predicate(
220+
fn type_op_normalize_predicate<'tcx>(
221221
tcx: TyCtxt<'tcx>,
222222
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<Predicate<'tcx>>>>,
223223
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, Predicate<'tcx>>>, NoSolution> {
224224
tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, type_op_normalize)
225225
}
226226

227-
fn type_op_normalize_fn_sig(
227+
fn type_op_normalize_fn_sig<'tcx>(
228228
tcx: TyCtxt<'tcx>,
229229
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<FnSig<'tcx>>>>,
230230
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, FnSig<'tcx>>>, NoSolution> {
231231
tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, type_op_normalize)
232232
}
233233

234-
fn type_op_normalize_poly_fn_sig(
234+
fn type_op_normalize_poly_fn_sig<'tcx>(
235235
tcx: TyCtxt<'tcx>,
236236
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<PolyFnSig<'tcx>>>>,
237237
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, PolyFnSig<'tcx>>>, NoSolution> {

0 commit comments

Comments
 (0)