Skip to content

Commit eb4fc71

Browse files
borsbors
committed
Auto merge of #79945 - jackh726:existential_trait_ref, r=nikomatsakis
Move binder for dyn to each list item This essentially changes `ty::Binder<&'tcx List<ExistentialTraitRef>>` to `&'tcx List<ty::Binder<ExistentialTraitRef>>`. This is a first step in moving the `dyn Trait` representation closer to Chalk, which we've talked about in `@rust-lang/wg-traits.` r? `@nikomatsakis`
2 parents d23e084 + 2edd301 commit eb4fc71

File tree

26 files changed

+319
-266
lines changed

26 files changed

+319
-266
lines changed

‎compiler/rustc_codegen_cranelift/src/value_and_place.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -480,17 +480,19 @@ impl<'tcx> CPlace<'tcx> {
480480
// fn(&T) -> for<'l> fn(&'l T) is allowed
481481
}
482482
(&ty::Dynamic(from_traits, _), &ty::Dynamic(to_traits, _)) => {
483-
let from_traits = fx
484-
.tcx
485-
.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), from_traits);
486-
let to_traits = fx
487-
.tcx
488-
.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), to_traits);
489-
assert_eq!(
490-
from_traits, to_traits,
491-
"Can't write trait object of incompatible traits {:?} to place with traits {:?}\n\n{:#?}",
492-
from_traits, to_traits, fx,
493-
);
483+
for (from, to) in from_traits.iter().zip(to_traits) {
484+
let from = fx
485+
.tcx
486+
.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), from);
487+
let to = fx
488+
.tcx
489+
.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), to);
490+
assert_eq!(
491+
from, to,
492+
"Can't write trait object of incompatible traits {:?} to place with traits {:?}\n\n{:#?}",
493+
from_traits, to_traits, fx,
494+
);
495+
}
494496
// dyn for<'r> Trait<'r> -> dyn Trait<'_> is allowed
495497
}
496498
_ => {

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
496496

497497
fn print_dyn_existential(
498498
self,
499-
_predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
499+
_predicates: &'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>,
500500
) -> Result<Self::DynExistential, Self::Error> {
501501
Err(NonTrivialPath)
502502
}

‎compiler/rustc_lint/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ impl<'tcx> LateContext<'tcx> {
786786

787787
fn print_dyn_existential(
788788
self,
789-
_predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
789+
_predicates: &'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>,
790790
) -> Result<Self::DynExistential, Self::Error> {
791791
Ok(())
792792
}

‎compiler/rustc_lint/src/unused.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,10 @@ impl<'tcx> LateLintPass<'tcx> for UnusedResults {
218218
}
219219
ty::Dynamic(binder, _) => {
220220
let mut has_emitted = false;
221-
for predicate in binder.skip_binder().iter() {
222-
if let ty::ExistentialPredicate::Trait(ref trait_ref) = predicate {
221+
for predicate in binder.iter() {
222+
if let ty::ExistentialPredicate::Trait(ref trait_ref) =
223+
predicate.skip_binder()
224+
{
223225
let def_id = trait_ref.def_id;
224226
let descr_post =
225227
&format!(" trait object{}{}", plural_suffix, descr_post,);

‎compiler/rustc_middle/src/ty/codec.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,14 @@ impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D> for ty::List<Ty<'tcx>> {
320320
}
321321
}
322322

323-
impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D> for ty::List<ty::ExistentialPredicate<'tcx>> {
323+
impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D>
324+
for ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>
325+
{
324326
fn decode(decoder: &mut D) -> Result<&'tcx Self, D::Error> {
325327
let len = decoder.read_usize()?;
326-
Ok(decoder.tcx().mk_existential_predicates((0..len).map(|_| Decodable::decode(decoder)))?)
328+
Ok(decoder
329+
.tcx()
330+
.mk_poly_existential_predicates((0..len).map(|_| Decodable::decode(decoder)))?)
327331
}
328332
}
329333

@@ -372,7 +376,7 @@ impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D> for [mir::abstract_const::N
372376
impl_decodable_via_ref! {
373377
&'tcx ty::TypeckResults<'tcx>,
374378
&'tcx ty::List<Ty<'tcx>>,
375-
&'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
379+
&'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>,
376380
&'tcx Allocation,
377381
&'tcx mir::Body<'tcx>,
378382
&'tcx mir::UnsafetyCheckResult,

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pub struct CtxtInterners<'tcx> {
8787
substs: InternedSet<'tcx, InternalSubsts<'tcx>>,
8888
canonical_var_infos: InternedSet<'tcx, List<CanonicalVarInfo<'tcx>>>,
8989
region: InternedSet<'tcx, RegionKind>,
90-
existential_predicates: InternedSet<'tcx, List<ExistentialPredicate<'tcx>>>,
90+
poly_existential_predicates: InternedSet<'tcx, List<ty::Binder<ExistentialPredicate<'tcx>>>>,
9191
predicate: InternedSet<'tcx, PredicateInner<'tcx>>,
9292
predicates: InternedSet<'tcx, List<Predicate<'tcx>>>,
9393
projs: InternedSet<'tcx, List<ProjectionKind>>,
@@ -103,7 +103,7 @@ impl<'tcx> CtxtInterners<'tcx> {
103103
type_list: Default::default(),
104104
substs: Default::default(),
105105
region: Default::default(),
106-
existential_predicates: Default::default(),
106+
poly_existential_predicates: Default::default(),
107107
canonical_var_infos: Default::default(),
108108
predicate: Default::default(),
109109
predicates: Default::default(),
@@ -1623,7 +1623,7 @@ nop_lift! {const_; &'a Const<'a> => &'tcx Const<'tcx>}
16231623
nop_lift! {predicate; &'a PredicateInner<'a> => &'tcx PredicateInner<'tcx>}
16241624

16251625
nop_list_lift! {type_list; Ty<'a> => Ty<'tcx>}
1626-
nop_list_lift! {existential_predicates; ExistentialPredicate<'a> => ExistentialPredicate<'tcx>}
1626+
nop_list_lift! {poly_existential_predicates; ty::Binder<ExistentialPredicate<'a>> => ty::Binder<ExistentialPredicate<'tcx>>}
16271627
nop_list_lift! {predicates; Predicate<'a> => Predicate<'tcx>}
16281628
nop_list_lift! {canonical_var_infos; CanonicalVarInfo<'a> => CanonicalVarInfo<'tcx>}
16291629
nop_list_lift! {projs; ProjectionKind => ProjectionKind}
@@ -2064,7 +2064,8 @@ slice_interners!(
20642064
type_list: _intern_type_list(Ty<'tcx>),
20652065
substs: _intern_substs(GenericArg<'tcx>),
20662066
canonical_var_infos: _intern_canonical_var_infos(CanonicalVarInfo<'tcx>),
2067-
existential_predicates: _intern_existential_predicates(ExistentialPredicate<'tcx>),
2067+
poly_existential_predicates:
2068+
_intern_poly_existential_predicates(ty::Binder<ExistentialPredicate<'tcx>>),
20682069
predicates: _intern_predicates(Predicate<'tcx>),
20692070
projs: _intern_projs(ProjectionKind),
20702071
place_elems: _intern_place_elems(PlaceElem<'tcx>),
@@ -2295,7 +2296,7 @@ impl<'tcx> TyCtxt<'tcx> {
22952296
#[inline]
22962297
pub fn mk_dynamic(
22972298
self,
2298-
obj: ty::Binder<&'tcx List<ExistentialPredicate<'tcx>>>,
2299+
obj: &'tcx List<ty::Binder<ExistentialPredicate<'tcx>>>,
22992300
reg: ty::Region<'tcx>,
23002301
) -> Ty<'tcx> {
23012302
self.mk_ty(Dynamic(obj, reg))
@@ -2425,13 +2426,17 @@ impl<'tcx> TyCtxt<'tcx> {
24252426
Place { local: place.local, projection: self.intern_place_elems(&projection) }
24262427
}
24272428

2428-
pub fn intern_existential_predicates(
2429+
pub fn intern_poly_existential_predicates(
24292430
self,
2430-
eps: &[ExistentialPredicate<'tcx>],
2431-
) -> &'tcx List<ExistentialPredicate<'tcx>> {
2431+
eps: &[ty::Binder<ExistentialPredicate<'tcx>>],
2432+
) -> &'tcx List<ty::Binder<ExistentialPredicate<'tcx>>> {
24322433
assert!(!eps.is_empty());
2433-
assert!(eps.array_windows().all(|[a, b]| a.stable_cmp(self, b) != Ordering::Greater));
2434-
self._intern_existential_predicates(eps)
2434+
assert!(
2435+
eps.array_windows()
2436+
.all(|[a, b]| a.skip_binder().stable_cmp(self, &b.skip_binder())
2437+
!= Ordering::Greater)
2438+
);
2439+
self._intern_poly_existential_predicates(eps)
24352440
}
24362441

24372442
pub fn intern_predicates(self, preds: &[Predicate<'tcx>]) -> &'tcx List<Predicate<'tcx>> {
@@ -2488,13 +2493,16 @@ impl<'tcx> TyCtxt<'tcx> {
24882493
})
24892494
}
24902495

2491-
pub fn mk_existential_predicates<
2492-
I: InternAs<[ExistentialPredicate<'tcx>], &'tcx List<ExistentialPredicate<'tcx>>>,
2496+
pub fn mk_poly_existential_predicates<
2497+
I: InternAs<
2498+
[ty::Binder<ExistentialPredicate<'tcx>>],
2499+
&'tcx List<ty::Binder<ExistentialPredicate<'tcx>>>,
2500+
>,
24932501
>(
24942502
self,
24952503
iter: I,
24962504
) -> I::Output {
2497-
iter.intern_with(|xs| self.intern_existential_predicates(xs))
2505+
iter.intern_with(|xs| self.intern_poly_existential_predicates(xs))
24982506
}
24992507

25002508
pub fn mk_predicates<I: InternAs<[Predicate<'tcx>], &'tcx List<Predicate<'tcx>>>>(

‎compiler/rustc_middle/src/ty/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub enum TypeError<'tcx> {
5858
CyclicTy(Ty<'tcx>),
5959
CyclicConst(&'tcx ty::Const<'tcx>),
6060
ProjectionMismatched(ExpectedFound<DefId>),
61-
ExistentialMismatch(ExpectedFound<&'tcx ty::List<ty::ExistentialPredicate<'tcx>>>),
61+
ExistentialMismatch(ExpectedFound<&'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>>),
6262
ObjectUnsafeCoercion(DefId),
6363
ConstMismatch(ExpectedFound<&'tcx ty::Const<'tcx>>),
6464

‎compiler/rustc_middle/src/ty/flags.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,15 @@ impl FlagComputation {
160160
}
161161

162162
&ty::Dynamic(obj, r) => {
163-
self.bound_computation(obj, |computation, obj| {
164-
for predicate in obj.iter() {
165-
match predicate {
166-
ty::ExistentialPredicate::Trait(tr) => {
167-
computation.add_substs(tr.substs)
168-
}
169-
ty::ExistentialPredicate::Projection(p) => {
170-
computation.add_existential_projection(&p);
171-
}
172-
ty::ExistentialPredicate::AutoTrait(_) => {}
163+
for predicate in obj.iter() {
164+
self.bound_computation(predicate, |computation, predicate| match predicate {
165+
ty::ExistentialPredicate::Trait(tr) => computation.add_substs(tr.substs),
166+
ty::ExistentialPredicate::Projection(p) => {
167+
computation.add_existential_projection(&p);
173168
}
174-
}
175-
});
169+
ty::ExistentialPredicate::AutoTrait(_) => {}
170+
});
171+
}
176172

177173
self.add_region(r);
178174
}

‎compiler/rustc_middle/src/ty/print/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub trait Printer<'tcx>: Sized {
6363

6464
fn print_dyn_existential(
6565
self,
66-
predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
66+
predicates: &'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>,
6767
) -> Result<Self::DynExistential, Self::Error>;
6868

6969
fn print_const(self, ct: &'tcx ty::Const<'tcx>) -> Result<Self::Const, Self::Error>;
@@ -343,7 +343,9 @@ impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for Ty<'tcx> {
343343
}
344344
}
345345

346-
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for &'tcx ty::List<ty::ExistentialPredicate<'tcx>> {
346+
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P>
347+
for &'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'tcx>>>
348+
{
347349
type Output = P::DynExistential;
348350
type Error = P::Error;
349351
fn print(&self, cx: P) -> Result<Self::Output, Self::Error> {

0 commit comments

Comments
 (0)