mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 08:13:41 +00:00
Deny capturing late-bound ty/ct params in nested opaques
This commit is contained in:
parent
58abbaf077
commit
8d871b7687
@ -177,6 +177,7 @@ enum Scope<'a> {
|
|||||||
LateBoundary {
|
LateBoundary {
|
||||||
s: ScopeRef<'a>,
|
s: ScopeRef<'a>,
|
||||||
what: &'static str,
|
what: &'static str,
|
||||||
|
deny_late_regions: bool,
|
||||||
},
|
},
|
||||||
|
|
||||||
Root {
|
Root {
|
||||||
@ -234,9 +235,11 @@ impl<'a> fmt::Debug for TruncatedScopeDebug<'a> {
|
|||||||
.field("s", &"..")
|
.field("s", &"..")
|
||||||
.finish(),
|
.finish(),
|
||||||
Scope::TraitRefBoundary { s: _ } => f.debug_struct("TraitRefBoundary").finish(),
|
Scope::TraitRefBoundary { s: _ } => f.debug_struct("TraitRefBoundary").finish(),
|
||||||
Scope::LateBoundary { s: _, what } => {
|
Scope::LateBoundary { s: _, what, deny_late_regions } => f
|
||||||
f.debug_struct("LateBoundary").field("what", what).finish()
|
.debug_struct("LateBoundary")
|
||||||
}
|
.field("what", what)
|
||||||
|
.field("deny_late_regions", deny_late_regions)
|
||||||
|
.finish(),
|
||||||
Scope::Root { opt_parent_item } => {
|
Scope::Root { opt_parent_item } => {
|
||||||
f.debug_struct("Root").field("opt_parent_item", &opt_parent_item).finish()
|
f.debug_struct("Root").field("opt_parent_item", &opt_parent_item).finish()
|
||||||
}
|
}
|
||||||
@ -630,7 +633,16 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
|
|||||||
let scope = Scope::Opaque { captures: &captures, def_id: opaque.def_id, s: self.scope };
|
let scope = Scope::Opaque { captures: &captures, def_id: opaque.def_id, s: self.scope };
|
||||||
self.with(scope, |this| {
|
self.with(scope, |this| {
|
||||||
let scope = Scope::TraitRefBoundary { s: this.scope };
|
let scope = Scope::TraitRefBoundary { s: this.scope };
|
||||||
this.with(scope, |this| intravisit::walk_opaque_ty(this, opaque))
|
this.with(scope, |this| {
|
||||||
|
let scope = Scope::LateBoundary {
|
||||||
|
s: this.scope,
|
||||||
|
what: "nested `impl Trait`",
|
||||||
|
// We can capture late-bound regions; we just don't duplicate
|
||||||
|
// lifetime or const params, so we can't allow those.
|
||||||
|
deny_late_regions: false,
|
||||||
|
};
|
||||||
|
this.with(scope, |this| intravisit::walk_opaque_ty(this, opaque))
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
let captures = captures.into_inner().into_iter().collect();
|
let captures = captures.into_inner().into_iter().collect();
|
||||||
@ -987,9 +999,12 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn visit_anon_const(&mut self, c: &'tcx hir::AnonConst) {
|
fn visit_anon_const(&mut self, c: &'tcx hir::AnonConst) {
|
||||||
self.with(Scope::LateBoundary { s: self.scope, what: "constant" }, |this| {
|
self.with(
|
||||||
intravisit::walk_anon_const(this, c);
|
Scope::LateBoundary { s: self.scope, what: "constant", deny_late_regions: true },
|
||||||
});
|
|this| {
|
||||||
|
intravisit::walk_anon_const(this, c);
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_generic_param(&mut self, p: &'tcx GenericParam<'tcx>) {
|
fn visit_generic_param(&mut self, p: &'tcx GenericParam<'tcx>) {
|
||||||
@ -1281,8 +1296,10 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
|
|||||||
scope = s;
|
scope = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
Scope::LateBoundary { s, what } => {
|
Scope::LateBoundary { s, what, deny_late_regions } => {
|
||||||
crossed_late_boundary = Some(what);
|
if deny_late_regions {
|
||||||
|
crossed_late_boundary = Some(what);
|
||||||
|
}
|
||||||
scope = s;
|
scope = s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1498,7 +1515,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
|
|||||||
scope = s;
|
scope = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
Scope::LateBoundary { s, what } => {
|
Scope::LateBoundary { s, what, deny_late_regions: _ } => {
|
||||||
crossed_late_boundary = Some(what);
|
crossed_late_boundary = Some(what);
|
||||||
scope = s;
|
scope = s;
|
||||||
}
|
}
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
//@ known-bug: #131535
|
|
||||||
#![feature(non_lifetime_binders)]
|
|
||||||
trait v0<> {}
|
|
||||||
fn kind :(v0<'_, > impl for<v4> v0<'_, v2 = impl v0<v4> + '_>) {}
|
|
@ -1,7 +0,0 @@
|
|||||||
//@ known-bug: #121637
|
|
||||||
#![feature(non_lifetime_binders)]
|
|
||||||
trait Trait<Type> {
|
|
||||||
type Type;
|
|
||||||
|
|
||||||
fn method(&self) -> impl for<T> Trait<impl Trait<T>>;
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
//@ known-bug: #132530
|
|
||||||
|
|
||||||
#![feature(non_lifetime_binders)]
|
|
||||||
|
|
||||||
trait Trait<'a, A> {
|
|
||||||
type Assoc<'a> = i32;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn a() -> impl for<T> Trait<Assoc = impl Trait<T>> {}
|
|
@ -7,6 +7,7 @@ fn produce() -> impl for<T> Trait<(), Assoc = impl Trait<T>> {
|
|||||||
//~^ ERROR associated type `Assoc` not found for `Trait`
|
//~^ ERROR associated type `Assoc` not found for `Trait`
|
||||||
//~| ERROR associated type `Assoc` not found for `Trait`
|
//~| ERROR associated type `Assoc` not found for `Trait`
|
||||||
//~| the trait bound `{integer}: Trait<()>` is not satisfied
|
//~| the trait bound `{integer}: Trait<()>` is not satisfied
|
||||||
|
//~| ERROR cannot capture late-bound type parameter in nested `impl Trait`
|
||||||
16
|
16
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
error: cannot capture late-bound type parameter in nested `impl Trait`
|
||||||
|
--> $DIR/non-lifetime-binder-in-constraint.rs:6:58
|
||||||
|
|
|
||||||
|
LL | fn produce() -> impl for<T> Trait<(), Assoc = impl Trait<T>> {
|
||||||
|
| - parameter defined here ^
|
||||||
|
|
||||||
error[E0220]: associated type `Assoc` not found for `Trait`
|
error[E0220]: associated type `Assoc` not found for `Trait`
|
||||||
--> $DIR/non-lifetime-binder-in-constraint.rs:6:39
|
--> $DIR/non-lifetime-binder-in-constraint.rs:6:39
|
||||||
|
|
|
|
||||||
@ -27,7 +33,7 @@ help: this trait has no implementations, consider adding one
|
|||||||
LL | trait Trait<T: ?Sized> {}
|
LL | trait Trait<T: ?Sized> {}
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
error: aborting due to 3 previous errors
|
error: aborting due to 4 previous errors
|
||||||
|
|
||||||
Some errors have detailed explanations: E0220, E0277.
|
Some errors have detailed explanations: E0220, E0277.
|
||||||
For more information about an error, try `rustc --explain E0220`.
|
For more information about an error, try `rustc --explain E0220`.
|
||||||
|
@ -5,6 +5,7 @@ trait Trait<T> {}
|
|||||||
|
|
||||||
fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
||||||
//~^ ERROR nested `impl Trait` is not allowed
|
//~^ ERROR nested `impl Trait` is not allowed
|
||||||
//~| ERROR the trait bound `(): Trait<impl Trait<T>>` is not satisfied
|
//~| ERROR the trait bound `(): Trait<impl Trait<{type error}>>` is not satisfied
|
||||||
|
//~| ERROR cannot capture late-bound type parameter in nested `impl Trait`
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
@ -7,11 +7,19 @@ LL | fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
|||||||
| | nested `impl Trait` here
|
| | nested `impl Trait` here
|
||||||
| outer `impl Trait`
|
| outer `impl Trait`
|
||||||
|
|
||||||
error[E0277]: the trait bound `(): Trait<impl Trait<T>>` is not satisfied
|
error: cannot capture late-bound type parameter in nested `impl Trait`
|
||||||
|
--> $DIR/non-lifetime-binder.rs:6:40
|
||||||
|
|
|
||||||
|
LL | fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
||||||
|
| - ^
|
||||||
|
| |
|
||||||
|
| parameter defined here
|
||||||
|
|
||||||
|
error[E0277]: the trait bound `(): Trait<impl Trait<{type error}>>` is not satisfied
|
||||||
--> $DIR/non-lifetime-binder.rs:6:11
|
--> $DIR/non-lifetime-binder.rs:6:11
|
||||||
|
|
|
|
||||||
LL | fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
LL | fn f() -> impl for<T> Trait<impl Trait<T>> {}
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait<impl Trait<T>>` is not implemented for `()`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait<impl Trait<{type error}>>` is not implemented for `()`
|
||||||
|
|
|
|
||||||
help: this trait has no implementations, consider adding one
|
help: this trait has no implementations, consider adding one
|
||||||
--> $DIR/non-lifetime-binder.rs:4:1
|
--> $DIR/non-lifetime-binder.rs:4:1
|
||||||
@ -19,7 +27,7 @@ help: this trait has no implementations, consider adding one
|
|||||||
LL | trait Trait<T> {}
|
LL | trait Trait<T> {}
|
||||||
| ^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^
|
||||||
|
|
||||||
error: aborting due to 2 previous errors
|
error: aborting due to 3 previous errors
|
||||||
|
|
||||||
Some errors have detailed explanations: E0277, E0666.
|
Some errors have detailed explanations: E0277, E0666.
|
||||||
For more information about an error, try `rustc --explain E0277`.
|
For more information about an error, try `rustc --explain E0277`.
|
||||||
|
Loading…
Reference in New Issue
Block a user