Skip to content

Commit b680a5e

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#68877 - estebank:point-at-params, r=petrochenkov
On mismatched argument count point at arguments
2 parents bfb9604 + 683ebc2 commit b680a5e

35 files changed

+214
-105
lines changed

‎src/librustc_typeck/check/mod.rs

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3843,17 +3843,58 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
38433843
error_code: &str,
38443844
c_variadic: bool,
38453845
sugg_unit: bool| {
3846+
let (span, start_span, args) = match &expr.kind {
3847+
hir::ExprKind::Call(hir::Expr { span, .. }, args) => (*span, *span, &args[..]),
3848+
hir::ExprKind::MethodCall(path_segment, span, args) => (
3849+
*span,
3850+
// `sp` doesn't point at the whole `foo.bar()`, only at `bar`.
3851+
path_segment
3852+
.args
3853+
.and_then(|args| args.args.iter().last())
3854+
// Account for `foo.bar::<T>()`.
3855+
.map(|arg| {
3856+
// Skip the closing `>`.
3857+
tcx.sess
3858+
.source_map()
3859+
.next_point(tcx.sess.source_map().next_point(arg.span()))
3860+
})
3861+
.unwrap_or(*span),
3862+
&args[1..], // Skip the receiver.
3863+
),
3864+
k => span_bug!(sp, "checking argument types on a non-call: `{:?}`", k),
3865+
};
3866+
let arg_spans = if args.is_empty() {
3867+
// foo()
3868+
// ^^^-- supplied 0 arguments
3869+
// |
3870+
// expected 2 arguments
3871+
vec![tcx.sess.source_map().next_point(start_span).with_hi(sp.hi())]
3872+
} else {
3873+
// foo(1, 2, 3)
3874+
// ^^^ - - - supplied 3 arguments
3875+
// |
3876+
// expected 2 arguments
3877+
args.iter().map(|arg| arg.span).collect::<Vec<Span>>()
3878+
};
3879+
38463880
let mut err = tcx.sess.struct_span_err_with_code(
3847-
sp,
3881+
span,
38483882
&format!(
38493883
"this function takes {}{} but {} {} supplied",
38503884
if c_variadic { "at least " } else { "" },
3851-
potentially_plural_count(expected_count, "parameter"),
3852-
potentially_plural_count(arg_count, "parameter"),
3885+
potentially_plural_count(expected_count, "argument"),
3886+
potentially_plural_count(arg_count, "argument"),
38533887
if arg_count == 1 { "was" } else { "were" }
38543888
),
38553889
DiagnosticId::Error(error_code.to_owned()),
38563890
);
3891+
let label = format!("supplied {}", potentially_plural_count(arg_count, "argument"));
3892+
for (i, span) in arg_spans.into_iter().enumerate() {
3893+
err.span_label(
3894+
span,
3895+
if arg_count == 0 || i + 1 == arg_count { &label } else { "" },
3896+
);
3897+
}
38573898

38583899
if let Some(def_s) = def_span.map(|sp| tcx.sess.source_map().def_span(sp)) {
38593900
err.span_label(def_s, "defined here");
@@ -3870,11 +3911,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
38703911
);
38713912
} else {
38723913
err.span_label(
3873-
sp,
3914+
span,
38743915
format!(
38753916
"expected {}{}",
38763917
if c_variadic { "at least " } else { "" },
3877-
potentially_plural_count(expected_count, "parameter")
3918+
potentially_plural_count(expected_count, "argument")
38783919
),
38793920
);
38803921
}
@@ -5622,8 +5663,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
56225663

56235664
self.tcx.sess.span_err(
56245665
span,
5625-
"this function can only be invoked \
5626-
directly, not through a function pointer",
5666+
"this function can only be invoked directly, not through a function pointer",
56275667
);
56285668
}
56295669

‎src/test/ui/arg-count-mismatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern: parameters were supplied
1+
// error-pattern: arguments were supplied
22

33
fn f(x: isize) { }
44

‎src/test/ui/arg-count-mismatch.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
error[E0061]: this function takes 1 parameter but 0 parameters were supplied
1+
error[E0061]: this function takes 1 argument but 0 arguments were supplied
22
--> $DIR/arg-count-mismatch.rs:5:28
33
|
44
LL | fn f(x: isize) { }
55
| -------------- defined here
66
LL |
77
LL | fn main() { let i: (); i = f(); }
8-
| ^^^ expected 1 parameter
8+
| ^-- supplied 0 arguments
9+
| |
10+
| expected 1 argument
911

1012
error: aborting due to previous error
1113

‎src/test/ui/c-variadic/variadic-ffi-1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ extern "C" fn bar(f: isize, x: u8) {}
1313

1414
fn main() {
1515
unsafe {
16-
foo(); //~ ERROR this function takes at least 2 parameters but 0 parameters were supplied
17-
foo(1); //~ ERROR this function takes at least 2 parameters but 1 parameter was supplied
16+
foo(); //~ ERROR this function takes at least 2 arguments but 0 arguments were supplied
17+
foo(1); //~ ERROR this function takes at least 2 arguments but 1 argument was supplied
1818

1919
let x: unsafe extern "C" fn(f: isize, x: u8) = foo; //~ ERROR mismatched types
2020
let y: extern "C" fn(f: isize, x: u8, ...) = bar; //~ ERROR mismatched types

‎src/test/ui/c-variadic/variadic-ffi-1.stderr

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,27 @@ error[E0045]: C-variadic function must have C or cdecl calling convention
44
LL | fn printf(_: *const u8, ...);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadics require C or cdecl calling convention
66

7-
error[E0060]: this function takes at least 2 parameters but 0 parameters were supplied
7+
error[E0060]: this function takes at least 2 arguments but 0 arguments were supplied
88
--> $DIR/variadic-ffi-1.rs:16:9
99
|
1010
LL | fn foo(f: isize, x: u8, ...);
1111
| ----------------------------- defined here
1212
...
1313
LL | foo();
14-
| ^^^^^ expected at least 2 parameters
14+
| ^^^-- supplied 0 arguments
15+
| |
16+
| expected at least 2 arguments
1517

16-
error[E0060]: this function takes at least 2 parameters but 1 parameter was supplied
18+
error[E0060]: this function takes at least 2 arguments but 1 argument was supplied
1719
--> $DIR/variadic-ffi-1.rs:17:9
1820
|
1921
LL | fn foo(f: isize, x: u8, ...);
2022
| ----------------------------- defined here
2123
...
2224
LL | foo(1);
23-
| ^^^^^^ expected at least 2 parameters
25+
| ^^^ - supplied 1 argument
26+
| |
27+
| expected at least 2 arguments
2428

2529
error[E0308]: mismatched types
2630
--> $DIR/variadic-ffi-1.rs:19:56

‎src/test/ui/error-codes/E0057.stderr

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
error[E0057]: this function takes 1 parameter but 0 parameters were supplied
1+
error[E0057]: this function takes 1 argument but 0 arguments were supplied
22
--> $DIR/E0057.rs:3:13
33
|
44
LL | let a = f();
5-
| ^^^ expected 1 parameter
5+
| ^-- supplied 0 arguments
6+
| |
7+
| expected 1 argument
68

7-
error[E0057]: this function takes 1 parameter but 2 parameters were supplied
9+
error[E0057]: this function takes 1 argument but 2 arguments were supplied
810
--> $DIR/E0057.rs:5:13
911
|
1012
LL | let c = f(2, 3);
11-
| ^^^^^^^ expected 1 parameter
13+
| ^ - - supplied 2 arguments
14+
| |
15+
| expected 1 argument
1216

1317
error: aborting due to 2 previous errors
1418

‎src/test/ui/error-codes/E0060.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ extern "C" {
55
fn main() {
66
unsafe { printf(); }
77
//~^ ERROR E0060
8-
//~| expected at least 1 parameter
8+
//~| expected at least 1 argument
99
}

‎src/test/ui/error-codes/E0060.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
error[E0060]: this function takes at least 1 parameter but 0 parameters were supplied
1+
error[E0060]: this function takes at least 1 argument but 0 arguments were supplied
22
--> $DIR/E0060.rs:6:14
33
|
44
LL | fn printf(_: *const u8, ...) -> u32;
55
| ------------------------------------ defined here
66
...
77
LL | unsafe { printf(); }
8-
| ^^^^^^^^ expected at least 1 parameter
8+
| ^^^^^^-- supplied 0 arguments
9+
| |
10+
| expected at least 1 argument
911

1012
error: aborting due to previous error
1113

‎src/test/ui/error-codes/E0061.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ fn f2(a: u16) {}
55
fn main() {
66
f(0);
77
//~^ ERROR E0061
8-
//~| expected 2 parameters
8+
//~| expected 2 arguments
99

1010
f2();
1111
//~^ ERROR E0061
12-
//~| expected 1 parameter
12+
//~| expected 1 argument
1313
}

‎src/test/ui/error-codes/E0061.stderr

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
error[E0061]: this function takes 2 parameters but 1 parameter was supplied
1+
error[E0061]: this function takes 2 arguments but 1 argument was supplied
22
--> $DIR/E0061.rs:6:5
33
|
44
LL | fn f(a: u16, b: &str) {}
55
| --------------------- defined here
66
...
77
LL | f(0);
8-
| ^^^^ expected 2 parameters
8+
| ^ - supplied 1 argument
9+
| |
10+
| expected 2 arguments
911

10-
error[E0061]: this function takes 1 parameter but 0 parameters were supplied
12+
error[E0061]: this function takes 1 argument but 0 arguments were supplied
1113
--> $DIR/E0061.rs:10:5
1214
|
1315
LL | fn f2(a: u16) {}
1416
| ------------- defined here
1517
...
1618
LL | f2();
17-
| ^^^^ expected 1 parameter
19+
| ^^-- supplied 0 arguments
20+
| |
21+
| expected 1 argument
1822

1923
error: aborting due to 2 previous errors
2024

0 commit comments

Comments
 (0)