diff options
| -rw-r--r-- | src/librustc_typeck/check/mod.rs | 20 | ||||
| -rw-r--r-- | src/test/compile-fail/E0060.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/E0061.rs | 10 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-18819.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-3044.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-4935.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/method-call-err-msg.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/not-enough-arguments.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/overloaded-calls-bad.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/variadic-ffi-3.rs | 8 |
10 files changed, 30 insertions, 27 deletions
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 3d51da02b87..0d2129b2cb4 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -2481,16 +2481,18 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { if arg_count == 1 {" was"} else {"s were"}), error_code); - err.span_label(sp, &format!("expected {}{} parameter{}", - if variadic {"at least "} else {""}, - expected_count, - if expected_count == 1 {""} else {"s"})); - let input_types = fn_inputs.iter().map(|i| format!("{:?}", i)).collect::<Vec<String>>(); - if input_types.len() > 0 { - err.note(&format!("the following parameter type{} expected: {}", - if expected_count == 1 {" was"} else {"s were"}, - input_types.join(", "))); + if input_types.len() > 1 { + err.note("the following parameter types were expected:"); + err.note(&input_types.join(", ")); + } else if input_types.len() > 0 { + err.note(&format!("the following parameter type was expected: {}", + input_types[0])); + } else { + err.span_label(sp, &format!("expected {}{} parameter{}", + if variadic {"at least "} else {""}, + expected_count, + if expected_count == 1 {""} else {"s"})); } err.emit(); } diff --git a/src/test/compile-fail/E0060.rs b/src/test/compile-fail/E0060.rs index e1f2618c180..5182a2bf5a0 100644 --- a/src/test/compile-fail/E0060.rs +++ b/src/test/compile-fail/E0060.rs @@ -15,6 +15,5 @@ extern "C" { fn main() { unsafe { printf(); } //~^ ERROR E0060 - //~| NOTE expected at least 1 parameter - //~| NOTE the following parameter type was expected + //~| NOTE the following parameter type was expected: *const u8 } diff --git a/src/test/compile-fail/E0061.rs b/src/test/compile-fail/E0061.rs index ca04b059dc7..4c7c0dfd44c 100644 --- a/src/test/compile-fail/E0061.rs +++ b/src/test/compile-fail/E0061.rs @@ -10,9 +10,15 @@ fn f(a: u16, b: &str) {} +fn f2(a: u16) {} + fn main() { f(0); //~^ ERROR E0061 - //~| NOTE expected 2 parameters - //~| NOTE the following parameter types were expected + //~| NOTE the following parameter types were expected: + //~| NOTE u16, &str + + f2(); + //~^ ERROR E0061 + //~| NOTE the following parameter type was expected: u16 } diff --git a/src/test/compile-fail/issue-18819.rs b/src/test/compile-fail/issue-18819.rs index cf650460c3d..8035d798e32 100644 --- a/src/test/compile-fail/issue-18819.rs +++ b/src/test/compile-fail/issue-18819.rs @@ -25,6 +25,6 @@ fn print_x(_: &Foo<Item=bool>, extra: &str) { fn main() { print_x(X); //~^ ERROR this function takes 2 parameters but 1 parameter was supplied - //~| NOTE the following parameter types were expected: &Foo<Item=bool>, &str - //~| NOTE expected 2 parameters + //~| NOTE the following parameter types were expected: + //~| NOTE &Foo<Item=bool>, &str } diff --git a/src/test/compile-fail/issue-3044.rs b/src/test/compile-fail/issue-3044.rs index d19e3b2c7b0..b934cbe4b5d 100644 --- a/src/test/compile-fail/issue-3044.rs +++ b/src/test/compile-fail/issue-3044.rs @@ -15,6 +15,6 @@ fn main() { }); //~^^ ERROR this function takes 2 parameters but 1 parameter was supplied //~| NOTE the following parameter types were expected - //~| NOTE expected 2 parameters + //~| NOTE _, _ // the first error is, um, non-ideal. } diff --git a/src/test/compile-fail/issue-4935.rs b/src/test/compile-fail/issue-4935.rs index 58a84f3490b..08707a187df 100644 --- a/src/test/compile-fail/issue-4935.rs +++ b/src/test/compile-fail/issue-4935.rs @@ -14,4 +14,3 @@ fn foo(a: usize) {} fn main() { foo(5, 6) } //~^ ERROR this function takes 1 parameter but 2 parameters were supplied //~| NOTE the following parameter type was expected -//~| NOTE expected 1 parameter diff --git a/src/test/compile-fail/method-call-err-msg.rs b/src/test/compile-fail/method-call-err-msg.rs index bcf676dbede..b7e0c5b81d9 100644 --- a/src/test/compile-fail/method-call-err-msg.rs +++ b/src/test/compile-fail/method-call-err-msg.rs @@ -23,10 +23,9 @@ fn main() { //~^ NOTE expected 0 parameters .one() //~ ERROR this function takes 1 parameter but 0 parameters were supplied //~^ NOTE the following parameter type was expected - //~| NOTE expected 1 parameter .two(0); //~ ERROR this function takes 2 parameters but 1 parameter was supplied //~^ NOTE the following parameter types were expected - //~| NOTE expected 2 parameters + //~| NOTE isize, isize let y = Foo; y.zero() diff --git a/src/test/compile-fail/not-enough-arguments.rs b/src/test/compile-fail/not-enough-arguments.rs index f2f61fcaeec..660d48da4db 100644 --- a/src/test/compile-fail/not-enough-arguments.rs +++ b/src/test/compile-fail/not-enough-arguments.rs @@ -19,6 +19,6 @@ fn foo(a: isize, b: isize, c: isize, d:isize) { fn main() { foo(1, 2, 3); //~^ ERROR this function takes 4 parameters but 3 - //~| NOTE the following parameter types were expected - //~| NOTE expected 4 parameters + //~| NOTE the following parameter types were expected: + //~| NOTE isize, isize, isize, isize } diff --git a/src/test/compile-fail/overloaded-calls-bad.rs b/src/test/compile-fail/overloaded-calls-bad.rs index 1825ec61f1e..0aa9af3c8da 100644 --- a/src/test/compile-fail/overloaded-calls-bad.rs +++ b/src/test/compile-fail/overloaded-calls-bad.rs @@ -42,9 +42,7 @@ fn main() { let ans = s(); //~^ ERROR this function takes 1 parameter but 0 parameters were supplied //~| NOTE the following parameter type was expected - //~| NOTE expected 1 parameter let ans = s("burma", "shave"); //~^ ERROR this function takes 1 parameter but 2 parameters were supplied //~| NOTE the following parameter type was expected - //~| NOTE expected 1 parameter } diff --git a/src/test/compile-fail/variadic-ffi-3.rs b/src/test/compile-fail/variadic-ffi-3.rs index cc9a7c84ede..334b8bb08ae 100644 --- a/src/test/compile-fail/variadic-ffi-3.rs +++ b/src/test/compile-fail/variadic-ffi-3.rs @@ -17,11 +17,11 @@ extern "C" fn bar(f: isize, x: u8) {} fn main() { unsafe { foo(); //~ ERROR: this function takes at least 2 parameters but 0 parameters were supplied - //~^ NOTE the following parameter types were expected - //~| NOTE expected at least 2 parameters + //~^ NOTE the following parameter types were expected: + //~| NOTE isize, u8 foo(1); //~ ERROR: this function takes at least 2 parameters but 1 parameter was supplied - //~^ NOTE the following parameter types were expected - //~| NOTE expected at least 2 parameters + //~^ NOTE the following parameter types were expected: + //~| NOTE isize, u8 let x: unsafe extern "C" fn(f: isize, x: u8) = foo; //~^ ERROR: mismatched types |