Run tests in nll mode

oli-obk · oli-obk · commit e67594166ecb · 2021-03-15T18:35:47.000Z
diff --git a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.full_tait.nll.stderr b/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.full_tait.nll.stderr
@@ -0,0 +1,50 @@
+error: at least one trait must be specified
+  --> $DIR/generic_type_does_not_live_long_enough.rs:12:24
+   |
+LL | type WrongGeneric<T> = impl 'static;
+   |                        ^^^^^^^^^^^^
+
+warning: the feature `type_alias_impl_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/generic_type_does_not_live_long_enough.rs:3:32
+   |
+LL | #![cfg_attr(full_tait, feature(type_alias_impl_trait))]
+   |                                ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
+
+error[E0308]: mismatched types
+  --> $DIR/generic_type_does_not_live_long_enough.rs:9:18
+   |
+LL |     let z: i32 = x;
+   |            ---   ^ expected `i32`, found opaque type
+   |            |
+   |            expected due to this
+...
+LL | type WrongGeneric<T> = impl 'static;
+   |                        ------------ the found opaque type
+   |
+   = note:     expected type `i32`
+           found opaque type `impl Sized`
+
+error[E0310]: the parameter type `T` may not live long enough
+  --> $DIR/generic_type_does_not_live_long_enough.rs:17:30
+   |
+LL | fn wrong_generic<T>(t: T) -> WrongGeneric<T> {
+   |                              ^^^^^^^^^^^^^^^
+   |
+   = help: consider adding an explicit lifetime bound `T: 'static`...
+
+error[E0310]: the parameter type `T` may not live long enough
+  --> $DIR/generic_type_does_not_live_long_enough.rs:12:24
+   |
+LL | type WrongGeneric<T> = impl 'static;
+   |                        ^^^^^^^^^^^^
+   |
+   = help: consider adding an explicit lifetime bound `T: 'static`...
+   = note: ...so that the type `T` will meet its required lifetime bounds
+
+error: aborting due to 4 previous errors; 1 warning emitted
+
+Some errors have detailed explanations: E0308, E0310.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.min_tait.nll.stderr b/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.min_tait.nll.stderr
@@ -1,11 +1,11 @@
 error: at least one trait must be specified
-  --> $DIR/generic_type_does_not_live_long_enough.rs:9:24
+  --> $DIR/generic_type_does_not_live_long_enough.rs:12:24
    |
 LL | type WrongGeneric<T> = impl 'static;
    |                        ^^^^^^^^^^^^
 
 error[E0308]: mismatched types
-  --> $DIR/generic_type_does_not_live_long_enough.rs:6:18
+  --> $DIR/generic_type_does_not_live_long_enough.rs:9:18
    |
 LL |     let z: i32 = x;
    |            ---   ^ expected `i32`, found opaque type
@@ -19,15 +19,15 @@ LL | type WrongGeneric<T> = impl 'static;
            found opaque type `impl Sized`
 
 error[E0310]: the parameter type `T` may not live long enough
-  --> $DIR/generic_type_does_not_live_long_enough.rs:14:30
+  --> $DIR/generic_type_does_not_live_long_enough.rs:17:30
    |
 LL | fn wrong_generic<T>(t: T) -> WrongGeneric<T> {
    |                              ^^^^^^^^^^^^^^^
    |
    = help: consider adding an explicit lifetime bound `T: 'static`...
 
 error[E0310]: the parameter type `T` may not live long enough
-  --> $DIR/generic_type_does_not_live_long_enough.rs:9:24
+  --> $DIR/generic_type_does_not_live_long_enough.rs:12:24
    |
 LL | type WrongGeneric<T> = impl 'static;
    |                        ^^^^^^^^^^^^
diff --git a/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.full_tait.nll.stderr b/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.full_tait.nll.stderr
@@ -0,0 +1,47 @@
+warning: the feature `type_alias_impl_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/issue-57611-trait-alias.rs:8:32
+   |
+LL | #![cfg_attr(full_tait, feature(type_alias_impl_trait))]
+   |                                ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
+
+error: higher-ranked subtype error
+  --> $DIR/issue-57611-trait-alias.rs:28:9
+   |
+LL |         |x| x
+   |         ^^^^^
+
+error: higher-ranked subtype error
+  --> $DIR/issue-57611-trait-alias.rs:28:9
+   |
+LL |         |x| x
+   |         ^^^^^
+
+error[E0308]: mismatched types
+  --> $DIR/issue-57611-trait-alias.rs:20:16
+   |
+LL |     type Bar = impl Baz<Self, Self>;
+   |                ^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
+   |
+   = note: expected type `for<'r> Fn<(&'r X,)>`
+              found type `Fn<(&'static X,)>`
+note: this closure does not fulfill the lifetime requirements
+  --> $DIR/issue-57611-trait-alias.rs:28:9
+   |
+LL |         |x| x
+   |         ^^^^^
+
+error: implementation of `FnOnce` is not general enough
+  --> $DIR/issue-57611-trait-alias.rs:20:16
+   |
+LL |     type Bar = impl Baz<Self, Self>;
+   |                ^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough
+   |
+   = note: closure with signature `fn(&'static X) -> &'static X` must implement `FnOnce<(&'0 X,)>`, for any lifetime `'0`...
+   = note: ...but it actually implements `FnOnce<(&'static X,)>`
+
+error: aborting due to 4 previous errors; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.min_tait.nll.stderr b/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.min_tait.nll.stderr
@@ -1,31 +1,31 @@
 error: higher-ranked subtype error
-  --> $DIR/issue-57611-trait-alias.rs:25:9
+  --> $DIR/issue-57611-trait-alias.rs:28:9
    |
 LL |         |x| x
    |         ^^^^^
 
 error: higher-ranked subtype error
-  --> $DIR/issue-57611-trait-alias.rs:25:9
+  --> $DIR/issue-57611-trait-alias.rs:28:9
    |
 LL |         |x| x
    |         ^^^^^
 
 error[E0308]: mismatched types
-  --> $DIR/issue-57611-trait-alias.rs:17:16
+  --> $DIR/issue-57611-trait-alias.rs:20:16
    |
 LL |     type Bar = impl Baz<Self, Self>;
    |                ^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
    = note: expected type `for<'r> Fn<(&'r X,)>`
               found type `Fn<(&'static X,)>`
 note: this closure does not fulfill the lifetime requirements
-  --> $DIR/issue-57611-trait-alias.rs:25:9
+  --> $DIR/issue-57611-trait-alias.rs:28:9
    |
 LL |         |x| x
    |         ^^^^^
 
 error: implementation of `FnOnce` is not general enough
-  --> $DIR/issue-57611-trait-alias.rs:17:16
+  --> $DIR/issue-57611-trait-alias.rs:20:16
    |
 LL |     type Bar = impl Baz<Self, Self>;
    |                ^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`error: at least one trait must be specified`
`2`		`- --> $DIR/generic_type_does_not_live_long_enough.rs:9:24`
	`2`	`+ --> $DIR/generic_type_does_not_live_long_enough.rs:12:24`
`3`	`3`	`\|`
`4`	`4`	`LL \| type WrongGeneric<T> = impl 'static;`
`5`	`5`	`\| ^^^^^^^^^^^^`
`6`	`6`
`7`	`7`	`error[E0308]: mismatched types`
`8`		`- --> $DIR/generic_type_does_not_live_long_enough.rs:6:18`
	`8`	`+ --> $DIR/generic_type_does_not_live_long_enough.rs:9:18`
`9`	`9`	`\|`
`10`	`10`	`LL \| let z: i32 = x;`
`11`	`11`	\| --- ^ expected `i32`, found opaque type
`@@ -19,15 +19,15 @@ LL \| type WrongGeneric<T> = impl 'static;`
`19`	`19`	found opaque type `impl Sized`
`20`	`20`
`21`	`21`	error[E0310]: the parameter type `T` may not live long enough
`22`		`- --> $DIR/generic_type_does_not_live_long_enough.rs:14:30`
	`22`	`+ --> $DIR/generic_type_does_not_live_long_enough.rs:17:30`
`23`	`23`	`\|`
`24`	`24`	`LL \| fn wrong_generic<T>(t: T) -> WrongGeneric<T> {`
`25`	`25`	`\| ^^^^^^^^^^^^^^^`
`26`	`26`	`\|`
`27`	`27`	= help: consider adding an explicit lifetime bound `T: 'static`...
`28`	`28`
`29`	`29`	error[E0310]: the parameter type `T` may not live long enough
`30`		`- --> $DIR/generic_type_does_not_live_long_enough.rs:9:24`
	`30`	`+ --> $DIR/generic_type_does_not_live_long_enough.rs:12:24`
`31`	`31`	`\|`
`32`	`32`	`LL \| type WrongGeneric<T> = impl 'static;`
`33`	`33`	`\| ^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,31 @@`
`1`	`1`	`error: higher-ranked subtype error`
`2`		`- --> $DIR/issue-57611-trait-alias.rs:25:9`
	`2`	`+ --> $DIR/issue-57611-trait-alias.rs:28:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| \|x\| x`
`5`	`5`	`\| ^^^^^`
`6`	`6`
`7`	`7`	`error: higher-ranked subtype error`
`8`		`- --> $DIR/issue-57611-trait-alias.rs:25:9`
	`8`	`+ --> $DIR/issue-57611-trait-alias.rs:28:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| \|x\| x`
`11`	`11`	`\| ^^^^^`
`12`	`12`
`13`	`13`	`error[E0308]: mismatched types`
`14`		`- --> $DIR/issue-57611-trait-alias.rs:17:16`
	`14`	`+ --> $DIR/issue-57611-trait-alias.rs:20:16`
`15`	`15`	`\|`
`16`	`16`	`LL \| type Bar = impl Baz<Self, Self>;`
`17`	`17`	`\| ^^^^^^^^^^^^^^^^^^^^ one type is more general than the other`
`18`	`18`	`\|`
`19`	`19`	= note: expected type `for<'r> Fn<(&'r X,)>`
`20`	`20`	found type `Fn<(&'static X,)>`
`21`	`21`	`note: this closure does not fulfill the lifetime requirements`
`22`		`- --> $DIR/issue-57611-trait-alias.rs:25:9`
	`22`	`+ --> $DIR/issue-57611-trait-alias.rs:28:9`
`23`	`23`	`\|`
`24`	`24`	`LL \| \|x\| x`
`25`	`25`	`\| ^^^^^`
`26`	`26`
`27`	`27`	error: implementation of `FnOnce` is not general enough
`28`		`- --> $DIR/issue-57611-trait-alias.rs:17:16`
	`28`	`+ --> $DIR/issue-57611-trait-alias.rs:20:16`
`29`	`29`	`\|`
`30`	`30`	`LL \| type Bar = impl Baz<Self, Self>;`
`31`	`31`	\| ^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough