Skip to content

Commit 321a5db

Browse files
Check pointee metadata correctly in ui test
1 parent f5c78c4 commit 321a5db

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

compiler/rustc_trait_selection/src/solve/project_goals.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,8 @@ impl<'tcx> assembly::GoalKind<'tcx> for ProjectionPredicate<'tcx> {
346346
LangItem::Sized,
347347
[ty::GenericArg::from(goal.predicate.self_ty())],
348348
));
349-
350349
ecx.add_goal(goal.with(tcx, sized_predicate));
351-
ecx.eq(goal.param_env, goal.predicate.term, tcx.types.unit.into())?;
352-
return ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes);
350+
tcx.types.unit
353351
}
354352

355353
ty::Adt(def, substs) if def.is_struct() => {

tests/ui/traits/new-solver/pointee.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ use std::ptr::{DynMetadata, Pointee};
77
trait Trait<U> {}
88
struct MyDst<T: ?Sized>(T);
99

10-
fn works<T>() {
11-
let _: <T as Pointee>::Metadata = ();
12-
let _: <[T] as Pointee>::Metadata = 1_usize;
13-
let _: <str as Pointee>::Metadata = 1_usize;
14-
let _: <dyn Trait<T> as Pointee>::Metadata = give::<DynMetadata<dyn Trait<T>>>();
15-
let _: <MyDst<T> as Pointee>::Metadata = ();
16-
let _: <((((([u8],),),),),) as Pointee>::Metadata = 1_usize;
17-
}
10+
fn meta_is<T: Pointee<Metadata = U> + ?Sized, U>() {}
1811

19-
fn give<U>() -> U {
20-
loop {}
12+
fn works<T>() {
13+
meta_is::<T, ()>();
14+
meta_is::<[T], usize>();
15+
meta_is::<str, usize>();
16+
meta_is::<dyn Trait<T>, DynMetadata<dyn Trait<T>>>();
17+
meta_is::<MyDst<T>, ()>();
18+
meta_is::<((((([u8],),),),),), usize>();
2119
}
2220

2321
fn main() {}

0 commit comments

Comments
 (0)