From 2679944653bb7ef1690840cc177da9896daa2963 Mon Sep 17 00:00:00 2001 From: Ariel Ben-Yehuda Date: Wed, 13 Dec 2017 23:06:54 -0600 Subject: fix broken assertion in type_param Nested generics (aka method generics) in trait methods don't have an *additional* Self parameter in their own type parameter list (they have a Self parameter in the parent generics), so don't try to check we're correctly adjusting for it. Fixes #46568. --- .../lifetimes/lifetime-doesnt-live-long-enough.rs | 8 +++ .../lifetime-doesnt-live-long-enough.stderr | 63 ++++++++++++++-------- 2 files changed, 49 insertions(+), 22 deletions(-) (limited to 'src/test') diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs index 58c33af0ddd..0099a8bc10f 100644 --- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs +++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs @@ -33,11 +33,19 @@ struct Foo { trait X: Sized { fn foo<'a, L: X<&'a Nested>>(); //~^ ERROR may not live long enough + // check that we give a sane error for `Self` fn bar<'a, L: X<&'a Nested>>(); //~^ ERROR may not live long enough + + // check that we give a sane error for nested generics + fn baz<'a, L, M: X<&'a Nested>>() { + //~^ ERROR may not live long enough + } } +trait TraitB {} + struct Nested(K); impl Nested { fn generic_in_parent<'a, L: X<&'a Nested>>() { diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr index 342c6ab8f16..05908606da7 100644 --- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr +++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr @@ -41,54 +41,73 @@ note: ...so that the reference type `&'a Nested` does not outlive the data it | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0309]: the parameter type `Self` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:37:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:38:5 | -37 | fn bar<'a, L: X<&'a Nested>>(); +38 | fn bar<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `Self: 'a`... note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:37:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:38:5 | -37 | fn bar<'a, L: X<&'a Nested>>(); +38 | fn bar<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +error[E0309]: the parameter type `L` may not live long enough + --> $DIR/lifetime-doesnt-live-long-enough.rs:42:5 + | +42 | fn baz<'a, L, M: X<&'a Nested>>() { + | ^ - help: consider adding an explicit lifetime bound `L: 'a`... + | _____| + | | +43 | | //~^ ERROR may not live long enough +44 | | } + | |_____^ + | +note: ...so that the reference type `&'a Nested` does not outlive the data it points at + --> $DIR/lifetime-doesnt-live-long-enough.rs:42:5 + | +42 | / fn baz<'a, L, M: X<&'a Nested>>() { +43 | | //~^ ERROR may not live long enough +44 | | } + | |_____^ + error[E0309]: the parameter type `K` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:43:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:51:5 | -42 | impl Nested { +50 | impl Nested { | - help: consider adding an explicit lifetime bound `K: 'a`... -43 | / fn generic_in_parent<'a, L: X<&'a Nested>>() { -44 | | //~^ ERROR may not live long enough -45 | | } +51 | / fn generic_in_parent<'a, L: X<&'a Nested>>() { +52 | | //~^ ERROR may not live long enough +53 | | } | |_____^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:43:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:51:5 | -43 | / fn generic_in_parent<'a, L: X<&'a Nested>>() { -44 | | //~^ ERROR may not live long enough -45 | | } +51 | / fn generic_in_parent<'a, L: X<&'a Nested>>() { +52 | | //~^ ERROR may not live long enough +53 | | } | |_____^ error[E0309]: the parameter type `M` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:46:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:54:5 | -46 | fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { +54 | fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { | ^ -- help: consider adding an explicit lifetime bound `M: 'a`... | _____| | | -47 | | //~^ ERROR may not live long enough -48 | | } +55 | | //~^ ERROR may not live long enough +56 | | } | |_____^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:46:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:54:5 | -46 | / fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { -47 | | //~^ ERROR may not live long enough -48 | | } +54 | / fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { +55 | | //~^ ERROR may not live long enough +56 | | } | |_____^ -error: aborting due to 6 previous errors +error: aborting due to 7 previous errors -- cgit 1.4.1-3-g733a5