New upstream version 1.63.0+dfsg1

[rustc.git] / src / test / ui / argument-suggestions / invalid_arguments.rs

diff --git a/src/test/ui/argument-suggestions/invalid_arguments.rs b/src/test/ui/argument-suggestions/invalid_arguments.rs
index aea445d945754658afb6ad798c1cf3c2619f7049..53fbdd4b5da3ea45a48e0270135d8069ac459e96 100644 (file)
--- a/src/test/ui/argument-suggestions/invalid_arguments.rs
+++ b/src/test/ui/argument-suggestions/invalid_arguments.rs
@@ -15,50 +15,29 @@ fn main() {
   // Providing one or two invalid arguments to a two parameter function
   two_arg_same(1, ""); //~ ERROR mismatched types
   two_arg_same("", 1); //~ ERROR mismatched types
-  two_arg_same("", "");
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
+  two_arg_same("", ""); //~ ERROR arguments to this function are incorrect
   two_arg_diff(1, ""); //~ ERROR mismatched types
   two_arg_diff("", 1.0); //~ ERROR mismatched types
-  two_arg_diff("", "");
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
+  two_arg_diff("", ""); //~ ERROR arguments to this function are incorrect
+
   // Providing invalid arguments to a three parameter function
   three_arg_diff(X{}, 1.0, ""); //~ ERROR mismatched types
   three_arg_diff(1, X {}, ""); //~ ERROR mismatched types
   three_arg_diff(1, 1.0, X {}); //~ ERROR mismatched types
 
-  three_arg_diff(X {}, X {}, "");
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  three_arg_diff(X {}, 1.0, X {});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  three_arg_diff(1, X {}, X {});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
+  three_arg_diff(X {}, X {}, ""); //~ ERROR arguments to this function are incorrect
+  three_arg_diff(X {}, 1.0, X {}); //~ ERROR arguments to this function are incorrect
+  three_arg_diff(1, X {}, X {}); //~ ERROR arguments to this function are incorrect
 
-  three_arg_diff(X {}, X {}, X {});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  //~| ERROR mismatched types
+  three_arg_diff(X {}, X {}, X {}); //~ ERROR arguments to this function are incorrect
 
   three_arg_repeat(X {}, 1, ""); //~ ERROR mismatched types
   three_arg_repeat(1, X {}, ""); //~ ERROR mismatched types
   three_arg_repeat(1, 1, X {}); //~ ERROR mismatched types
 
-  three_arg_repeat(X {}, X {}, "");
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  three_arg_repeat(X {}, 1, X {});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  three_arg_repeat(1, X {}, X{});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
+  three_arg_repeat(X {}, X {}, ""); //~ ERROR arguments to this function are incorrect
+  three_arg_repeat(X {}, 1, X {}); //~ ERROR arguments to this function are incorrect
+  three_arg_repeat(1, X {}, X{}); //~ ERROR arguments to this function are incorrect
 
-  three_arg_repeat(X {}, X {}, X {});
-  //~^ ERROR mismatched types
-  //~| ERROR mismatched types
-  //~| ERROR mismatched types
+  three_arg_repeat(X {}, X {}, X {}); //~ ERROR arguments to this function are incorrect
 }