Rollup merge of #92710 - jackh726:issue-92280, r=nikomatsakis
Include Projections when elaborating TypeOutlives Fixes #92280 In `Elaborator`, we elaborate that `Foo<<Bar as Baz>::Assoc>: 'a` -> `<Bar as Baz>::Assoc: 'a`. This is the same rule that would be applied to any other `Param`. If there are escaping vars, we continue to do nothing. r? `@nikomatsakis`
This commit is contained in:
commit
9835b90c91
@ -164,7 +164,7 @@ pub fn process_registered_region_obligations(
|
|||||||
"cannot process registered region obligations in a snapshot"
|
"cannot process registered region obligations in a snapshot"
|
||||||
);
|
);
|
||||||
|
|
||||||
debug!("process_registered_region_obligations()");
|
debug!(?param_env, "process_registered_region_obligations()");
|
||||||
|
|
||||||
let my_region_obligations = self.take_registered_region_obligations();
|
let my_region_obligations = self.take_registered_region_obligations();
|
||||||
|
|
||||||
@ -356,6 +356,8 @@ fn projection_must_outlive(
|
|||||||
let trait_bounds: Vec<_> =
|
let trait_bounds: Vec<_> =
|
||||||
self.verify_bound.projection_declared_bounds_from_trait(projection_ty).collect();
|
self.verify_bound.projection_declared_bounds_from_trait(projection_ty).collect();
|
||||||
|
|
||||||
|
debug!(?trait_bounds);
|
||||||
|
|
||||||
// Compute the bounds we can derive from the environment. This
|
// Compute the bounds we can derive from the environment. This
|
||||||
// is an "approximate" match -- in some cases, these bounds
|
// is an "approximate" match -- in some cases, these bounds
|
||||||
// may not apply.
|
// may not apply.
|
||||||
|
@ -241,10 +241,19 @@ fn elaborate(&mut self, obligation: &PredicateObligation<'tcx>) {
|
|||||||
|
|
||||||
Component::UnresolvedInferenceVariable(_) => None,
|
Component::UnresolvedInferenceVariable(_) => None,
|
||||||
|
|
||||||
Component::Projection(_) | Component::EscapingProjection(_) => {
|
Component::Projection(projection) => {
|
||||||
// We can probably do more here. This
|
// We might end up here if we have `Foo<<Bar as Baz>::Assoc>: 'a`.
|
||||||
// corresponds to a case like `<T as
|
// With this, we can deduce that `<Bar as Baz>::Assoc: 'a`.
|
||||||
// Foo<'a>>::U: 'b`.
|
let ty =
|
||||||
|
tcx.mk_projection(projection.item_def_id, projection.substs);
|
||||||
|
Some(ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(
|
||||||
|
ty, r_min,
|
||||||
|
)))
|
||||||
|
}
|
||||||
|
|
||||||
|
Component::EscapingProjection(_) => {
|
||||||
|
// We might be able to do more here, but we don't
|
||||||
|
// want to deal with escaping vars right now.
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -206,7 +206,9 @@ fn confirm_projection_candidate(
|
|||||||
})?);
|
})?);
|
||||||
|
|
||||||
if let ty::Projection(..) = placeholder_self_ty.kind() {
|
if let ty::Projection(..) = placeholder_self_ty.kind() {
|
||||||
for predicate in tcx.predicates_of(def_id).instantiate_own(tcx, substs).predicates {
|
let predicates = tcx.predicates_of(def_id).instantiate_own(tcx, substs).predicates;
|
||||||
|
debug!(?predicates, "projection predicates");
|
||||||
|
for predicate in predicates {
|
||||||
let normalized = normalize_with_depth_to(
|
let normalized = normalize_with_depth_to(
|
||||||
self,
|
self,
|
||||||
obligation.param_env,
|
obligation.param_env,
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
error[E0311]: the parameter type `C` may not live long enough
|
||||||
|
--> $DIR/issue-92096.rs:20:33
|
||||||
|
|
|
||||||
|
LL | fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
|
||||||
|
| - ^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
|
||||||
|
| |
|
||||||
|
| help: consider adding an explicit lifetime bound...: `C: 'a`
|
||||||
|
|
||||||
|
error[E0311]: the parameter type `C` may not live long enough
|
||||||
|
--> $DIR/issue-92096.rs:20:33
|
||||||
|
|
|
||||||
|
LL | fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
|
||||||
|
| - ^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
|
||||||
|
| |
|
||||||
|
| help: consider adding an explicit lifetime bound...: `C: 'a`
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
29
src/test/ui/generic-associated-types/issue-92096.rs
Normal file
29
src/test/ui/generic-associated-types/issue-92096.rs
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
// edition:2018
|
||||||
|
// [nll] check-pass
|
||||||
|
// revisions: migrate nll
|
||||||
|
// Explicitly testing nll with revision, so ignore compare-mode=nll
|
||||||
|
// ignore-compare-mode-nll
|
||||||
|
|
||||||
|
#![cfg_attr(nll, feature(nll))]
|
||||||
|
#![feature(generic_associated_types)]
|
||||||
|
|
||||||
|
use std::future::Future;
|
||||||
|
|
||||||
|
trait Client {
|
||||||
|
type Connecting<'a>: Future + Send
|
||||||
|
where
|
||||||
|
Self: 'a;
|
||||||
|
|
||||||
|
fn connect(&'_ self) -> Self::Connecting<'_>;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
|
||||||
|
//[migrate]~^ ERROR the parameter
|
||||||
|
//[migrate]~| ERROR the parameter
|
||||||
|
where
|
||||||
|
C: Client + Send + Sync,
|
||||||
|
{
|
||||||
|
async move { c.connect().await }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
26
src/test/ui/generic-associated-types/issue-92280.rs
Normal file
26
src/test/ui/generic-associated-types/issue-92280.rs
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// check-pass
|
||||||
|
|
||||||
|
#![feature(generic_associated_types)]
|
||||||
|
#![allow(non_camel_case_types)]
|
||||||
|
|
||||||
|
trait HasAssoc {
|
||||||
|
type Assoc;
|
||||||
|
}
|
||||||
|
|
||||||
|
trait Iterate<S: HasAssoc> {
|
||||||
|
type Iter<'a>
|
||||||
|
where
|
||||||
|
Self: 'a;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct KeySegment_Broken<T> {
|
||||||
|
key: T,
|
||||||
|
}
|
||||||
|
impl<S: HasAssoc> Iterate<S> for KeySegment_Broken<S::Assoc> {
|
||||||
|
type Iter<'a>
|
||||||
|
where
|
||||||
|
Self: 'a,
|
||||||
|
= ();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Reference in New Issue
Block a user