rebase and review comments

estebank · estebank · commit 5d63e10318ea · 2023-02-14T20:22:10.000Z
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
@@ -612,7 +612,7 @@ impl Diagnostic {
     pub fn multipart_suggestion_with_style(
         &mut self,
         msg: impl Into<SubdiagnosticMessage>,
-        mut suggestion: Vec<(Span, String)>,
+        suggestion: Vec<(Span, String)>,
         applicability: Applicability,
         style: SuggestionStyle,
     ) -> &mut Self {
@@ -634,7 +634,6 @@ impl Diagnostic {
             None,
             "suggestion must not have overlapping parts",
         );
-        suggestion.sort_by_key(|(span, _)| (span.lo(), span.hi()));
 
         self.push_suggestion(CodeSuggestion {
             substitutions: vec![Substitution { parts }],
diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
@@ -930,7 +930,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         "".to_string()
                     };
                     labels
-                        .push((provided_span, format!("argument{} unexpected", provided_ty_name)));
+                        .push((provided_span, format!("unexpected argument{}", provided_ty_name)));
                     let mut span = provided_span;
                     if arg_idx.index() > 0
                         && let Some((_, prev)) = provided_arg_tys
diff --git a/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr b/tests/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
@@ -7,7 +7,7 @@ LL |   fn oom() -> ! {
    |  _-^^^^^^^^^^^^
 LL | |     loop {}
 LL | | }
-   | |_- argument of type `core::alloc::Layout` unexpected
+   | |_- unexpected argument of type `core::alloc::Layout`
    |
 note: function defined here
   --> $DIR/alloc-error-handler-bad-signature-3.rs:10:4
diff --git a/tests/ui/argument-suggestions/basic.stderr b/tests/ui/argument-suggestions/basic.stderr
@@ -16,7 +16,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/basic.rs:21:5
    |
 LL |     extra("");
-   |     ^^^^^ -- argument of type `&'static str` unexpected
+   |     ^^^^^ -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/basic.rs:14:4
diff --git a/tests/ui/argument-suggestions/exotic-calls.stderr b/tests/ui/argument-suggestions/exotic-calls.stderr
@@ -2,7 +2,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/exotic-calls.rs:2:5
    |
 LL |     t(1i32);
-   |     ^ ---- argument of type `i32` unexpected
+   |     ^ ---- unexpected argument of type `i32`
    |
 note: callable defined here
   --> $DIR/exotic-calls.rs:1:11
@@ -19,7 +19,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/exotic-calls.rs:7:5
    |
 LL |     t(1i32);
-   |     ^ ---- argument of type `i32` unexpected
+   |     ^ ---- unexpected argument of type `i32`
    |
 note: type parameter defined here
   --> $DIR/exotic-calls.rs:6:11
@@ -36,7 +36,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/exotic-calls.rs:16:5
    |
 LL |     baz()(1i32)
-   |     ^^^^^ ---- argument of type `i32` unexpected
+   |     ^^^^^ ---- unexpected argument of type `i32`
    |
 note: opaque type defined here
   --> $DIR/exotic-calls.rs:11:13
@@ -53,7 +53,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/exotic-calls.rs:22:5
    |
 LL |     x(1i32);
-   |     ^ ---- argument of type `i32` unexpected
+   |     ^ ---- unexpected argument of type `i32`
    |
 note: closure defined here
   --> $DIR/exotic-calls.rs:21:13
diff --git a/tests/ui/argument-suggestions/extra_arguments.stderr b/tests/ui/argument-suggestions/extra_arguments.stderr
@@ -2,7 +2,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/extra_arguments.rs:7:3
    |
 LL |   empty("");
-   |   ^^^^^ -- argument of type `&'static str` unexpected
+   |   ^^^^^ -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:1:4
@@ -19,7 +19,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/extra_arguments.rs:9:3
    |
 LL |   one_arg(1, 1);
-   |   ^^^^^^^    - argument of type `{integer}` unexpected
+   |   ^^^^^^^    - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:2:4
@@ -36,7 +36,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/extra_arguments.rs:10:3
    |
 LL |   one_arg(1, "");
-   |   ^^^^^^^    -- argument of type `&'static str` unexpected
+   |   ^^^^^^^    -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:2:4
@@ -53,9 +53,9 @@ error[E0061]: this function takes 1 argument but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:11:3
    |
 LL |   one_arg(1, "", 1.0);
-   |   ^^^^^^^    --  --- argument of type `{float}` unexpected
+   |   ^^^^^^^    --  --- unexpected argument of type `{float}`
    |              |
-   |              argument of type `&'static str` unexpected
+   |              unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:2:4
@@ -72,7 +72,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:13:3
    |
 LL |   two_arg_same(1, 1, 1);
-   |   ^^^^^^^^^^^^       - argument of type `{integer}` unexpected
+   |   ^^^^^^^^^^^^       - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:3:4
@@ -89,7 +89,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:14:3
    |
 LL |   two_arg_same(1, 1, 1.0);
-   |   ^^^^^^^^^^^^       --- argument of type `{float}` unexpected
+   |   ^^^^^^^^^^^^       --- unexpected argument of type `{float}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:3:4
@@ -106,7 +106,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:16:3
    |
 LL |   two_arg_diff(1, 1, "");
-   |   ^^^^^^^^^^^^    - argument of type `{integer}` unexpected
+   |   ^^^^^^^^^^^^    - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
@@ -123,7 +123,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:17:3
    |
 LL |   two_arg_diff(1, "", "");
-   |   ^^^^^^^^^^^^        -- argument of type `&'static str` unexpected
+   |   ^^^^^^^^^^^^        -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
@@ -140,9 +140,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied
   --> $DIR/extra_arguments.rs:18:3
    |
 LL |   two_arg_diff(1, 1, "", "");
-   |   ^^^^^^^^^^^^    -      -- argument of type `&'static str` unexpected
+   |   ^^^^^^^^^^^^    -      -- unexpected argument of type `&'static str`
    |                   |
-   |                   argument of type `{integer}` unexpected
+   |                   unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
@@ -159,9 +159,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied
   --> $DIR/extra_arguments.rs:19:3
    |
 LL |   two_arg_diff(1, "", 1, "");
-   |   ^^^^^^^^^^^^        -  -- argument of type `&'static str` unexpected
+   |   ^^^^^^^^^^^^        -  -- unexpected argument of type `&'static str`
    |                       |
-   |                       argument of type `{integer}` unexpected
+   |                       unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
@@ -178,7 +178,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:22:3
    |
 LL |   two_arg_same(1, 1,     "");
-   |   ^^^^^^^^^^^^           -- argument of type `&'static str` unexpected
+   |   ^^^^^^^^^^^^           -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:3:4
@@ -195,7 +195,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/extra_arguments.rs:23:3
    |
 LL |   two_arg_diff(1, 1,     "");
-   |   ^^^^^^^^^^^^    - argument of type `{integer}` unexpected
+   |   ^^^^^^^^^^^^    - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
@@ -215,7 +215,7 @@ LL |   two_arg_same(
    |   ^^^^^^^^^^^^
 ...
 LL |     ""
-   |     -- argument of type `&'static str` unexpected
+   |     -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:3:4
@@ -235,7 +235,7 @@ LL |   two_arg_diff(
    |   ^^^^^^^^^^^^
 LL |     1,
 LL |     1,
-   |     - argument of type `{integer}` unexpected
+   |     - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/extra_arguments.rs:4:4
diff --git a/tests/ui/argument-suggestions/issue-101097.stderr b/tests/ui/argument-suggestions/issue-101097.stderr
@@ -4,7 +4,7 @@ error[E0061]: this function takes 6 arguments but 7 arguments were supplied
 LL |     f(C, A, A, A, B, B, C);
    |     ^ -     -  -  - expected `C`, found `B`
    |       |     |  |
-   |       |     |  argument of type `A` unexpected
+   |       |     |  unexpected argument of type `A`
    |       |     expected `B`, found `A`
    |       expected `A`, found `C`
    |
@@ -64,8 +64,8 @@ error[E0308]: arguments to this function are incorrect
 LL |     f(A, A, D, D, B, B);
    |     ^       -  -  ---- two arguments of type `C` and `C` are missing
    |             |  |
-   |             |  argument of type `D` unexpected
-   |             argument of type `D` unexpected
+   |             |  unexpected argument of type `D`
+   |             unexpected argument of type `D`
    |
 note: function defined here
   --> $DIR/issue-101097.rs:6:4
diff --git a/tests/ui/argument-suggestions/issue-97484.stderr b/tests/ui/argument-suggestions/issue-97484.stderr
@@ -2,11 +2,11 @@ error[E0061]: this function takes 4 arguments but 7 arguments were supplied
   --> $DIR/issue-97484.rs:12:5
    |
 LL |     foo(&&A, B, C, D, E, F, G);
-   |     ^^^      -  -     -  - argument of type `F` unexpected
+   |     ^^^      -  -     -  - unexpected argument of type `F`
    |              |  |     |
    |              |  |     expected `&E`, found `E`
-   |              |  argument of type `C` unexpected
-   |              argument of type `B` unexpected
+   |              |  unexpected argument of type `C`
+   |              unexpected argument of type `B`
    |
 note: function defined here
   --> $DIR/issue-97484.rs:9:4
diff --git a/tests/ui/argument-suggestions/mixed_cases.stderr b/tests/ui/argument-suggestions/mixed_cases.stderr
@@ -2,7 +2,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/mixed_cases.rs:10:3
    |
 LL |   two_args(1, "", X {});
-   |   ^^^^^^^^    --  ---- argument of type `X` unexpected
+   |   ^^^^^^^^    --  ---- unexpected argument of type `X`
    |               |
    |               expected `f32`, found `&str`
    |
@@ -21,9 +21,9 @@ error[E0061]: this function takes 3 arguments but 4 arguments were supplied
   --> $DIR/mixed_cases.rs:11:3
    |
 LL |   three_args(1, "", X {}, "");
-   |   ^^^^^^^^^^    --  ----  -- argument of type `&'static str` unexpected
+   |   ^^^^^^^^^^    --  ----  -- unexpected argument of type `&'static str`
    |                 |   |
-   |                 |   argument of type `X` unexpected
+   |                 |   unexpected argument of type `X`
    |                 an argument of type `f32` is missing
    |
 note: function defined here
@@ -59,7 +59,7 @@ error[E0308]: arguments to this function are incorrect
   --> $DIR/mixed_cases.rs:17:3
    |
 LL |   three_args(1, "", X {});
-   |   ^^^^^^^^^^    --  ---- argument of type `X` unexpected
+   |   ^^^^^^^^^^    --  ---- unexpected argument of type `X`
    |                 |
    |                 an argument of type `f32` is missing
    |
diff --git a/tests/ui/error-codes/E0057.stderr b/tests/ui/error-codes/E0057.stderr
@@ -18,7 +18,7 @@ error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/E0057.rs:5:13
    |
 LL |     let c = f(2, 3);
-   |             ^    - argument of type `{integer}` unexpected
+   |             ^    - unexpected argument of type `{integer}`
    |
 note: closure defined here
   --> $DIR/E0057.rs:2:13
diff --git a/tests/ui/issues/issue-16939.stderr b/tests/ui/issues/issue-16939.stderr
@@ -2,7 +2,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/issue-16939.rs:5:9
    |
 LL |     |t| f(t);
-   |         ^ - argument unexpected
+   |         ^ - unexpected argument
    |
 note: callable defined here
   --> $DIR/issue-16939.rs:4:12
diff --git a/tests/ui/issues/issue-26094.rs b/tests/ui/issues/issue-26094.rs
@@ -1,6 +1,6 @@
 macro_rules! some_macro {
     ($other: expr) => ({
-        $other(None) //~ NOTE argument of type `Option<_>` unexpected
+        $other(None) //~ NOTE unexpected argument of type `Option<_>`
     })
 }
 
diff --git a/tests/ui/issues/issue-26094.stderr b/tests/ui/issues/issue-26094.stderr
@@ -2,7 +2,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/issue-26094.rs:10:17
    |
 LL |         $other(None)
-   |                ---- argument of type `Option<_>` unexpected
+   |                ---- unexpected argument of type `Option<_>`
 ...
 LL |     some_macro!(some_function);
    |                 ^^^^^^^^^^^^^
diff --git a/tests/ui/issues/issue-4935.stderr b/tests/ui/issues/issue-4935.stderr
@@ -2,7 +2,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/issue-4935.rs:5:13
    |
 LL | fn main() { foo(5, 6) }
-   |             ^^^    - argument of type `{integer}` unexpected
+   |             ^^^    - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/issue-4935.rs:3:4
diff --git a/tests/ui/methods/method-call-err-msg.stderr b/tests/ui/methods/method-call-err-msg.stderr
@@ -2,7 +2,7 @@ error[E0061]: this method takes 0 arguments but 1 argument was supplied
   --> $DIR/method-call-err-msg.rs:13:7
    |
 LL |     x.zero(0)
-   |       ^^^^ - argument of type `{integer}` unexpected
+   |       ^^^^ - unexpected argument of type `{integer}`
    |
 note: associated function defined here
   --> $DIR/method-call-err-msg.rs:5:8
diff --git a/tests/ui/mismatched_types/overloaded-calls-bad.stderr b/tests/ui/mismatched_types/overloaded-calls-bad.stderr
@@ -32,7 +32,7 @@ error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/overloaded-calls-bad.rs:37:15
    |
 LL |     let ans = s("burma", "shave");
-   |               ^ -------  ------- argument of type `&'static str` unexpected
+   |               ^ -------  ------- unexpected argument of type `&'static str`
    |                 |
    |                 expected `isize`, found `&str`
    |
diff --git a/tests/ui/resolve/resolve-primitive-fallback.stderr b/tests/ui/resolve/resolve-primitive-fallback.stderr
@@ -24,7 +24,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/resolve-primitive-fallback.rs:3:5
    |
 LL |     std::mem::size_of(u16);
-   |     ^^^^^^^^^^^^^^^^^ --- argument unexpected
+   |     ^^^^^^^^^^^^^^^^^ --- unexpected argument
    |
 note: function defined here
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
diff --git a/tests/ui/span/issue-34264.stderr b/tests/ui/span/issue-34264.stderr
@@ -54,7 +54,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/issue-34264.rs:7:5
    |
 LL |     foo(Some(42), 2, "");
-   |     ^^^              -- argument of type `&'static str` unexpected
+   |     ^^^              -- unexpected argument of type `&'static str`
    |
 note: function defined here
   --> $DIR/issue-34264.rs:1:4
@@ -85,7 +85,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/issue-34264.rs:10:5
    |
 LL |     bar(1, 2, 3);
-   |     ^^^       - argument of type `{integer}` unexpected
+   |     ^^^       - unexpected argument of type `{integer}`
    |
 note: function defined here
   --> $DIR/issue-34264.rs:3:4
diff --git a/tests/ui/suggestions/args-instead-of-tuple-errors.stderr b/tests/ui/suggestions/args-instead-of-tuple-errors.stderr
@@ -2,7 +2,7 @@ error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple-errors.rs:6:34
    |
 LL |     let _: Option<(i32, bool)> = Some(1, 2);
-   |                                  ^^^^    - argument of type `{integer}` unexpected
+   |                                  ^^^^    - unexpected argument of type `{integer}`
    |
 note: expected `(i32, bool)`, found integer
   --> $DIR/args-instead-of-tuple-errors.rs:6:39
@@ -30,7 +30,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/args-instead-of-tuple-errors.rs:8:5
    |
 LL |     int_bool(1, 2);
-   |     ^^^^^^^^    - argument of type `{integer}` unexpected
+   |     ^^^^^^^^    - unexpected argument of type `{integer}`
    |
 note: expected `(i32, bool)`, found integer
   --> $DIR/args-instead-of-tuple-errors.rs:8:14
diff --git a/tests/ui/tuple/wrong_argument_ice-3.stderr b/tests/ui/tuple/wrong_argument_ice-3.stderr
@@ -2,7 +2,7 @@ error[E0061]: this method takes 1 argument but 2 arguments were supplied
   --> $DIR/wrong_argument_ice-3.rs:9:16
    |
 LL |         groups.push(new_group, vec![process]);
-   |                ^^^^            ------------- argument of type `Vec<&Process>` unexpected
+   |                ^^^^            ------------- unexpected argument of type `Vec<&Process>`
    |
 note: expected `(Vec<String>, Vec<Process>)`, found `Vec<String>`
   --> $DIR/wrong_argument_ice-3.rs:9:21
diff --git a/tests/ui/tuple/wrong_argument_ice-4.stderr b/tests/ui/tuple/wrong_argument_ice-4.stderr
diff --git a/tests/ui/type/type-ascription-instead-of-initializer.stderr b/tests/ui/type/type-ascription-instead-of-initializer.stderr
diff --git a/tests/ui/typeck/remove-extra-argument.stderr b/tests/ui/typeck/remove-extra-argument.stderr
diff --git a/tests/ui/typeck/struct-enum-wrong-args.stderr b/tests/ui/typeck/struct-enum-wrong-args.stderr

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| fn oom() -> ! {`
`7`	`7`	`\| _-^^^^^^^^^^^^`
`8`	`8`	`LL \| \| loop {}`
`9`	`9`	`LL \| \| }`
`10`		- \| \|_- argument of type `core::alloc::Layout` unexpected
	`10`	+ \| \|_- unexpected argument of type `core::alloc::Layout`
`11`	`11`	`\|`
`12`	`12`	`note: function defined here`
`13`	`13`	`--> $DIR/alloc-error-handler-bad-signature-3.rs:10:4`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied`
`16`	`16`	`--> $DIR/basic.rs:21:5`
`17`	`17`	`\|`
`18`	`18`	`LL \| extra("");`
`19`		- \| ^^^^^ -- argument of type `&'static str` unexpected
	`19`	+ \| ^^^^^ -- unexpected argument of type `&'static str`
`20`	`20`	`\|`
`21`	`21`	`note: function defined here`
`22`	`22`	`--> $DIR/basic.rs:14:4`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied`
`2`	`2`	`--> $DIR/exotic-calls.rs:2:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| t(1i32);`
`5`		- \| ^ ---- argument of type `i32` unexpected
	`5`	+ \| ^ ---- unexpected argument of type `i32`
`6`	`6`	`\|`
`7`	`7`	`note: callable defined here`
`8`	`8`	`--> $DIR/exotic-calls.rs:1:11`
`@@ -19,7 +19,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied`
`19`	`19`	`--> $DIR/exotic-calls.rs:7:5`
`20`	`20`	`\|`
`21`	`21`	`LL \| t(1i32);`
`22`		- \| ^ ---- argument of type `i32` unexpected
	`22`	+ \| ^ ---- unexpected argument of type `i32`
`23`	`23`	`\|`
`24`	`24`	`note: type parameter defined here`
`25`	`25`	`--> $DIR/exotic-calls.rs:6:11`
`@@ -36,7 +36,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied`
`36`	`36`	`--> $DIR/exotic-calls.rs:16:5`
`37`	`37`	`\|`
`38`	`38`	`LL \| baz()(1i32)`
`39`		- \| ^^^^^ ---- argument of type `i32` unexpected
	`39`	+ \| ^^^^^ ---- unexpected argument of type `i32`
`40`	`40`	`\|`
`41`	`41`	`note: opaque type defined here`
`42`	`42`	`--> $DIR/exotic-calls.rs:11:13`
`@@ -53,7 +53,7 @@ error[E0057]: this function takes 0 arguments but 1 argument was supplied`
`53`	`53`	`--> $DIR/exotic-calls.rs:22:5`
`54`	`54`	`\|`
`55`	`55`	`LL \| x(1i32);`
`56`		- \| ^ ---- argument of type `i32` unexpected
	`56`	+ \| ^ ---- unexpected argument of type `i32`
`57`	`57`	`\|`
`58`	`58`	`note: closure defined here`
`59`	`59`	`--> $DIR/exotic-calls.rs:21:13`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied`
`2`	`2`	`--> $DIR/extra_arguments.rs:7:3`
`3`	`3`	`\|`
`4`	`4`	`LL \| empty("");`
`5`		- \| ^^^^^ -- argument of type `&'static str` unexpected
	`5`	+ \| ^^^^^ -- unexpected argument of type `&'static str`
`6`	`6`	`\|`
`7`	`7`	`note: function defined here`
`8`	`8`	`--> $DIR/extra_arguments.rs:1:4`
`@@ -19,7 +19,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied`
`19`	`19`	`--> $DIR/extra_arguments.rs:9:3`
`20`	`20`	`\|`
`21`	`21`	`LL \| one_arg(1, 1);`
`22`		- \| ^^^^^^^ - argument of type `{integer}` unexpected
	`22`	+ \| ^^^^^^^ - unexpected argument of type `{integer}`
`23`	`23`	`\|`
`24`	`24`	`note: function defined here`
`25`	`25`	`--> $DIR/extra_arguments.rs:2:4`
`@@ -36,7 +36,7 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied`
`36`	`36`	`--> $DIR/extra_arguments.rs:10:3`
`37`	`37`	`\|`
`38`	`38`	`LL \| one_arg(1, "");`
`39`		- \| ^^^^^^^ -- argument of type `&'static str` unexpected
	`39`	+ \| ^^^^^^^ -- unexpected argument of type `&'static str`
`40`	`40`	`\|`
`41`	`41`	`note: function defined here`
`42`	`42`	`--> $DIR/extra_arguments.rs:2:4`
`@@ -53,9 +53,9 @@ error[E0061]: this function takes 1 argument but 3 arguments were supplied`
`53`	`53`	`--> $DIR/extra_arguments.rs:11:3`
`54`	`54`	`\|`
`55`	`55`	`LL \| one_arg(1, "", 1.0);`
`56`		- \| ^^^^^^^ -- --- argument of type `{float}` unexpected
	`56`	+ \| ^^^^^^^ -- --- unexpected argument of type `{float}`
`57`	`57`	`\| \|`
`58`		- \| argument of type `&'static str` unexpected
	`58`	+ \| unexpected argument of type `&'static str`
`59`	`59`	`\|`
`60`	`60`	`note: function defined here`
`61`	`61`	`--> $DIR/extra_arguments.rs:2:4`
`@@ -72,7 +72,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`72`	`72`	`--> $DIR/extra_arguments.rs:13:3`
`73`	`73`	`\|`
`74`	`74`	`LL \| two_arg_same(1, 1, 1);`
`75`		- \| ^^^^^^^^^^^^ - argument of type `{integer}` unexpected
	`75`	+ \| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
`76`	`76`	`\|`
`77`	`77`	`note: function defined here`
`78`	`78`	`--> $DIR/extra_arguments.rs:3:4`
`@@ -89,7 +89,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`89`	`89`	`--> $DIR/extra_arguments.rs:14:3`
`90`	`90`	`\|`
`91`	`91`	`LL \| two_arg_same(1, 1, 1.0);`
`92`		- \| ^^^^^^^^^^^^ --- argument of type `{float}` unexpected
	`92`	+ \| ^^^^^^^^^^^^ --- unexpected argument of type `{float}`
`93`	`93`	`\|`
`94`	`94`	`note: function defined here`
`95`	`95`	`--> $DIR/extra_arguments.rs:3:4`
`@@ -106,7 +106,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`106`	`106`	`--> $DIR/extra_arguments.rs:16:3`
`107`	`107`	`\|`
`108`	`108`	`LL \| two_arg_diff(1, 1, "");`
`109`		- \| ^^^^^^^^^^^^ - argument of type `{integer}` unexpected
	`109`	+ \| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
`110`	`110`	`\|`
`111`	`111`	`note: function defined here`
`112`	`112`	`--> $DIR/extra_arguments.rs:4:4`
`@@ -123,7 +123,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`123`	`123`	`--> $DIR/extra_arguments.rs:17:3`
`124`	`124`	`\|`
`125`	`125`	`LL \| two_arg_diff(1, "", "");`
`126`		- \| ^^^^^^^^^^^^ -- argument of type `&'static str` unexpected
	`126`	+ \| ^^^^^^^^^^^^ -- unexpected argument of type `&'static str`
`127`	`127`	`\|`
`128`	`128`	`note: function defined here`
`129`	`129`	`--> $DIR/extra_arguments.rs:4:4`
`@@ -140,9 +140,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied`
`140`	`140`	`--> $DIR/extra_arguments.rs:18:3`
`141`	`141`	`\|`
`142`	`142`	`LL \| two_arg_diff(1, 1, "", "");`
`143`		- \| ^^^^^^^^^^^^ - -- argument of type `&'static str` unexpected
	`143`	+ \| ^^^^^^^^^^^^ - -- unexpected argument of type `&'static str`
`144`	`144`	`\| \|`
`145`		- \| argument of type `{integer}` unexpected
	`145`	+ \| unexpected argument of type `{integer}`
`146`	`146`	`\|`
`147`	`147`	`note: function defined here`
`148`	`148`	`--> $DIR/extra_arguments.rs:4:4`
`@@ -159,9 +159,9 @@ error[E0061]: this function takes 2 arguments but 4 arguments were supplied`
`159`	`159`	`--> $DIR/extra_arguments.rs:19:3`
`160`	`160`	`\|`
`161`	`161`	`LL \| two_arg_diff(1, "", 1, "");`
`162`		- \| ^^^^^^^^^^^^ - -- argument of type `&'static str` unexpected
	`162`	+ \| ^^^^^^^^^^^^ - -- unexpected argument of type `&'static str`
`163`	`163`	`\| \|`
`164`		- \| argument of type `{integer}` unexpected
	`164`	+ \| unexpected argument of type `{integer}`
`165`	`165`	`\|`
`166`	`166`	`note: function defined here`
`167`	`167`	`--> $DIR/extra_arguments.rs:4:4`
`@@ -178,7 +178,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`178`	`178`	`--> $DIR/extra_arguments.rs:22:3`
`179`	`179`	`\|`
`180`	`180`	`LL \| two_arg_same(1, 1, "");`
`181`		- \| ^^^^^^^^^^^^ -- argument of type `&'static str` unexpected
	`181`	+ \| ^^^^^^^^^^^^ -- unexpected argument of type `&'static str`
`182`	`182`	`\|`
`183`	`183`	`note: function defined here`
`184`	`184`	`--> $DIR/extra_arguments.rs:3:4`
`@@ -195,7 +195,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`195`	`195`	`--> $DIR/extra_arguments.rs:23:3`
`196`	`196`	`\|`
`197`	`197`	`LL \| two_arg_diff(1, 1, "");`
`198`		- \| ^^^^^^^^^^^^ - argument of type `{integer}` unexpected
	`198`	+ \| ^^^^^^^^^^^^ - unexpected argument of type `{integer}`
`199`	`199`	`\|`
`200`	`200`	`note: function defined here`
`201`	`201`	`--> $DIR/extra_arguments.rs:4:4`
`@@ -215,7 +215,7 @@ LL \| two_arg_same(`
`215`	`215`	`\| ^^^^^^^^^^^^`
`216`	`216`	`...`
`217`	`217`	`LL \| ""`
`218`		- \| -- argument of type `&'static str` unexpected
	`218`	+ \| -- unexpected argument of type `&'static str`
`219`	`219`	`\|`
`220`	`220`	`note: function defined here`
`221`	`221`	`--> $DIR/extra_arguments.rs:3:4`
`@@ -235,7 +235,7 @@ LL \| two_arg_diff(`
`235`	`235`	`\| ^^^^^^^^^^^^`
`236`	`236`	`LL \| 1,`
`237`	`237`	`LL \| 1,`
`238`		- \| - argument of type `{integer}` unexpected
	`238`	+ \| - unexpected argument of type `{integer}`
`239`	`239`	`\|`
`240`	`240`	`note: function defined here`
`241`	`241`	`--> $DIR/extra_arguments.rs:4:4`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0061]: this function takes 2 arguments but 3 arguments were supplied`
`2`	`2`	`--> $DIR/mixed_cases.rs:10:3`
`3`	`3`	`\|`
`4`	`4`	`LL \| two_args(1, "", X {});`
`5`		- \| ^^^^^^^^ -- ---- argument of type `X` unexpected
	`5`	+ \| ^^^^^^^^ -- ---- unexpected argument of type `X`
`6`	`6`	`\| \|`
`7`	`7`	\| expected `f32`, found `&str`
`8`	`8`	`\|`
`@@ -21,9 +21,9 @@ error[E0061]: this function takes 3 arguments but 4 arguments were supplied`
`21`	`21`	`--> $DIR/mixed_cases.rs:11:3`
`22`	`22`	`\|`
`23`	`23`	`LL \| three_args(1, "", X {}, "");`
`24`		- \| ^^^^^^^^^^ -- ---- -- argument of type `&'static str` unexpected
	`24`	+ \| ^^^^^^^^^^ -- ---- -- unexpected argument of type `&'static str`
`25`	`25`	`\| \| \|`
`26`		- \| \| argument of type `X` unexpected
	`26`	+ \| \| unexpected argument of type `X`
`27`	`27`	\| an argument of type `f32` is missing
`28`	`28`	`\|`
`29`	`29`	`note: function defined here`
`@@ -59,7 +59,7 @@ error[E0308]: arguments to this function are incorrect`
`59`	`59`	`--> $DIR/mixed_cases.rs:17:3`
`60`	`60`	`\|`
`61`	`61`	`LL \| three_args(1, "", X {});`
`62`		- \| ^^^^^^^^^^ -- ---- argument of type `X` unexpected
	`62`	+ \| ^^^^^^^^^^ -- ---- unexpected argument of type `X`
`63`	`63`	`\| \|`
`64`	`64`	\| an argument of type `f32` is missing
`65`	`65`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ error[E0057]: this function takes 1 argument but 2 arguments were supplied`
`18`	`18`	`--> $DIR/E0057.rs:5:13`
`19`	`19`	`\|`
`20`	`20`	`LL \| let c = f(2, 3);`
`21`		- \| ^ - argument of type `{integer}` unexpected
	`21`	+ \| ^ - unexpected argument of type `{integer}`
`22`	`22`	`\|`
`23`	`23`	`note: closure defined here`
`24`	`24`	`--> $DIR/E0057.rs:2:13`