Skip to content

Commit

Permalink
check all dyn obligations, actually
Browse files Browse the repository at this point in the history
  • Loading branch information
compiler-errors committed Mar 15, 2022
1 parent f14a5fd commit 67ef11d
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 28 deletions.
30 changes: 13 additions & 17 deletions compiler/rustc_trait_selection/src/traits/select/confirmation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,23 +468,19 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
.predicates
.into_iter()
{
if let ty::PredicateKind::Trait(..) | ty::PredicateKind::Projection(..) =
super_trait.kind().skip_binder()
{
let normalized_super_trait = normalize_with_depth_to(
self,
obligation.param_env,
obligation.cause.clone(),
obligation.recursion_depth + 1,
super_trait,
&mut nested,
);
nested.push(Obligation::new(
obligation.cause.clone(),
obligation.param_env,
normalized_super_trait,
));
}
let normalized_super_trait = normalize_with_depth_to(
self,
obligation.param_env,
obligation.cause.clone(),
obligation.recursion_depth + 1,
super_trait,
&mut nested,
);
nested.push(Obligation::new(
obligation.cause.clone(),
obligation.param_env,
normalized_super_trait,
));
}

let assoc_types: Vec<_> = tcx
Expand Down
11 changes: 11 additions & 0 deletions src/test/ui/traits/object/supertrait-lifetime-bound.nll.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error: lifetime may not live long enough
--> $DIR/supertrait-lifetime-bound.rs:10:5
|
LL | fn test2<'a>() {
| -- lifetime `'a` defined here
...
LL | test1::<dyn Bar<&'a u32>, _>();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'a` must outlive `'static`

error: aborting due to previous error

20 changes: 9 additions & 11 deletions src/test/ui/traits/object/supertrait-lifetime-bound.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
// check-pass
trait Foo: 'static { }

use std::any::Any;
trait Bar<T>: Foo { }

trait A<T>: Any {
fn m(&self) {}
}

impl<S, T: 'static> A<S> for T {}
fn test1<T: ?Sized + Bar<S>, S>() { }

fn call_obj<'a>() {
let obj: &dyn A<&'a ()> = &();
obj.m();
fn test2<'a>() {
// Here: the type `dyn Bar<&'a u32>` references `'a`,
// and so it does not outlive `'static`.
test1::<dyn Bar<&'a u32>, _>();
//~^ ERROR the type `(dyn Bar<&'a u32> + 'static)` does not fulfill the required lifetime
}

fn main() {}
fn main() { }
15 changes: 15 additions & 0 deletions src/test/ui/traits/object/supertrait-lifetime-bound.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error[E0477]: the type `(dyn Bar<&'a u32> + 'static)` does not fulfill the required lifetime
--> $DIR/supertrait-lifetime-bound.rs:10:5
|
LL | test1::<dyn Bar<&'a u32>, _>();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: type must satisfy the static lifetime as required by this binding
--> $DIR/supertrait-lifetime-bound.rs:5:22
|
LL | fn test1<T: ?Sized + Bar<S>, S>() { }
| ^^^^^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0477`.

0 comments on commit 67ef11d

Please sign in to comment.