Skip to content

Commit

Permalink
variant of PR 90840 with limited scope for backport.
Browse files Browse the repository at this point in the history
  • Loading branch information
BoxyUwU authored and pnkfelix committed Nov 22, 2021
1 parent ef1a3b9 commit f9ee681
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 19 deletions.
3 changes: 0 additions & 3 deletions compiler/rustc_typeck/src/check/dropck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,6 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>(
ty::PredicateKind::ConstEvaluatable(a),
ty::PredicateKind::ConstEvaluatable(b),
) => tcx.try_unify_abstract_consts((a, b)),
(ty::PredicateKind::TypeOutlives(a), ty::PredicateKind::TypeOutlives(b)) => {
relator.relate(predicate.rebind(a.0), p.rebind(b.0)).is_ok()
}
_ => predicate == p,
}
};
Expand Down
16 changes: 0 additions & 16 deletions src/test/ui/const-generics/generic_const_exprs/drop_impl.rs

This file was deleted.

13 changes: 13 additions & 0 deletions src/test/ui/dropck/relate_lt_in_type_outlives_bound.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
struct Wrapper<'a, T>(&'a T)
where
T: 'a;

impl<'a, T> Drop for Wrapper<'a, T>
where
T: 'static,
//~^ error: `Drop` impl requires `T: 'static` but the struct it is implemented for does not
{
fn drop(&mut self) {}
}

fn main() {}
17 changes: 17 additions & 0 deletions src/test/ui/dropck/relate_lt_in_type_outlives_bound.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
error[E0367]: `Drop` impl requires `T: 'static` but the struct it is implemented for does not
--> $DIR/relate_lt_in_type_outlives_bound.rs:7:8
|
LL | T: 'static,
| ^^^^^^^
|
note: the implementor must specify the same requirement
--> $DIR/relate_lt_in_type_outlives_bound.rs:1:1
|
LL | / struct Wrapper<'a, T>(&'a T)
LL | | where
LL | | T: 'a;
| |__________^

error: aborting due to previous error

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

0 comments on commit f9ee681

Please sign in to comment.