Changed tests

Author: Zoxc

tests/ui/typeck/issue-75883.rs

@@ -5,6 +5,7 @@ pub struct UI {}
 impl UI {
     pub fn run() -> Result<_> {
         //~^ ERROR: enum takes 2 generic arguments but 1 generic argument was supplied
+        //~| ERROR: enum takes 2 generic arguments but 1 generic argument was supplied
         //~| ERROR: the placeholder `_` is not allowed within types on item signatures for return types
         let mut ui = UI {};
         ui.interact();
@@ -14,6 +15,7 @@ impl UI {
 
     pub fn interact(&mut self) -> Result<_> {
         //~^ ERROR: enum takes 2 generic arguments but 1 generic argument was supplied
+        //~| ERROR: enum takes 2 generic arguments but 1 generic argument was supplied
         //~| ERROR: the placeholder `_` is not allowed within types on item signatures for return types
         unimplemented!();
     }

tests/ui/typeck/issue-75883.stderr

@@ -12,7 +12,7 @@ LL |     pub fn run() -> Result<_, E> {
    |                             +++
 
 error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
-  --> $DIR/issue-75883.rs:15:35
+  --> $DIR/issue-75883.rs:16:35
    |
 LL |     pub fn interact(&mut self) -> Result<_> {
    |                                   ^^^^^^ - supplied 1 generic argument
@@ -24,19 +24,47 @@ help: add missing generic argument
 LL |     pub fn interact(&mut self) -> Result<_, E> {
    |                                           +++
 
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
-  --> $DIR/issue-75883.rs:15:42
+error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
+  --> $DIR/issue-75883.rs:6:21
    |
-LL |     pub fn interact(&mut self) -> Result<_> {
-   |                                          ^ not allowed in type signatures
+LL |     pub fn run() -> Result<_> {
+   |                     ^^^^^^ - supplied 1 generic argument
+   |                     |
+   |                     expected 2 generic arguments
+   |
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+help: add missing generic argument
+   |
+LL |     pub fn run() -> Result<_, E> {
+   |                             +++
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
   --> $DIR/issue-75883.rs:6:28
    |
 LL |     pub fn run() -> Result<_> {
    |                            ^ not allowed in type signatures
 
-error: aborting due to 4 previous errors
+error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
+  --> $DIR/issue-75883.rs:16:35
+   |
+LL |     pub fn interact(&mut self) -> Result<_> {
+   |                                   ^^^^^^ - supplied 1 generic argument
+   |                                   |
+   |                                   expected 2 generic arguments
+   |
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+help: add missing generic argument
+   |
+LL |     pub fn interact(&mut self) -> Result<_, E> {
+   |                                           +++
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/issue-75883.rs:16:42
+   |
+LL |     pub fn interact(&mut self) -> Result<_> {
+   |                                          ^ not allowed in type signatures
+
+error: aborting due to 6 previous errors
 
 Some errors have detailed explanations: E0107, E0121.
 For more information about an error, try `rustc --explain E0107`.

tests/ui/typeck/issue-80779.stderr

@@ -1,3 +1,9 @@
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
+  --> $DIR/issue-80779.rs:5:29
+   |
+LL | pub fn f<'a>(val: T<'a>) -> _ {
+   |                             ^ not allowed in type signatures
+
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
   --> $DIR/issue-80779.rs:10:28
    |
@@ -10,18 +16,6 @@ LL - pub fn g(_: T<'static>) -> _ {}
 LL + pub fn g(_: T<'static>) -> () {}
    |
 
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
-  --> $DIR/issue-80779.rs:5:29
-   |
-LL | pub fn f<'a>(val: T<'a>) -> _ {
-   |                             ^ not allowed in type signatures
-   |
-help: replace with the correct return type
-   |
-LL - pub fn f<'a>(val: T<'a>) -> _ {
-LL + pub fn f<'a>(val: T<'a>) -> () {
-   |
-
 error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0121`.

tests/ui/typeck/typeck_type_placeholder_item.rs

@@ -47,6 +47,7 @@ impl Test9 {
 fn test11(x: &usize) -> &_ {
 //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
     &x
+    //~^ ERROR: `x` does not live long enough
 }
 
 unsafe fn test12(x: *const usize) -> *const *const _ {
@@ -129,13 +130,15 @@ pub fn main() {
 
     fn fn_test11(_: _) -> (_, _) { panic!() }
     //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
+    //~| ERROR the placeholder `_` is not allowed within types on item signatures for functions
     //~| ERROR type annotations needed
 
     fn fn_test12(x: i32) -> (_, _) { (x, x) }
     //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
 
     fn fn_test13(x: _) -> (i32, _) { (x, x) }
     //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
+    //~| ERROR the placeholder `_` is not allowed within types on item signatures for functions
 }
 
 trait T {
@@ -230,7 +233,6 @@ fn value() -> Option<&'static _> {
 
 const _: Option<_> = map(value);
 //~^ ERROR the placeholder `_` is not allowed within types on item signatures for constants
-//~| ERROR cannot call non-const function `map::<u8>` in constants
 
 fn evens_squared(n: usize) -> _ {
 //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types