diff options
| author | bors <bors@rust-lang.org> | 2019-06-03 05:40:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-03 05:40:53 +0000 |
| commit | c57ed9d9478dcd12c854a0ef4e83c7f384ade060 (patch) | |
| tree | b36a1449a687bef14dc91e2a547ee88c81ed0e86 /src/test/ui/parser | |
| parent | d59dcb261ecdc47d8afaac532050dadf86f3c898 (diff) | |
| parent | e275f2caf62b452913b301a31a2877d3f2f0711b (diff) | |
| download | rust-c57ed9d9478dcd12c854a0ef4e83c7f384ade060.tar.gz rust-c57ed9d9478dcd12c854a0ef4e83c7f384ade060.zip | |
Auto merge of #61331 - estebank:fn-arg-parse-recovery, r=varkor
Recover gracefully from argument with missing type or param name
Diffstat (limited to 'src/test/ui/parser')
| -rw-r--r-- | src/test/ui/parser/inverted-parameters.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/parser/inverted-parameters.stderr | 12 | ||||
| -rw-r--r-- | src/test/ui/parser/omitted-arg-in-item-fn.stderr | 10 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/test/ui/parser/inverted-parameters.rs b/src/test/ui/parser/inverted-parameters.rs index 42430278c72..f06b9510417 100644 --- a/src/test/ui/parser/inverted-parameters.rs +++ b/src/test/ui/parser/inverted-parameters.rs @@ -20,6 +20,8 @@ fn pattern((i32, i32) (a, b)) {} fn fizz(i32) {} //~^ ERROR expected one of `:` or `@` +//~| HELP if this was a parameter name, give it a type +//~| HELP if this is a type, explicitly ignore the parameter name fn missing_colon(quux S) {} //~^ ERROR expected one of `:` or `@` diff --git a/src/test/ui/parser/inverted-parameters.stderr b/src/test/ui/parser/inverted-parameters.stderr index bdb8faa6c65..fb48bd1fe93 100644 --- a/src/test/ui/parser/inverted-parameters.stderr +++ b/src/test/ui/parser/inverted-parameters.stderr @@ -33,9 +33,19 @@ error: expected one of `:` or `@`, found `)` | LL | fn fizz(i32) {} | ^ expected one of `:` or `@` here + | + = note: anonymous parameters are removed in the 2018 edition (see RFC 1685) +help: if this was a parameter name, give it a type + | +LL | fn fizz(i32: TypeName) {} + | ^^^^^^^^^^^^^ +help: if this is a type, explicitly ignore the parameter name + | +LL | fn fizz(_: i32) {} + | ^^^^^^ error: expected one of `:` or `@`, found `S` - --> $DIR/inverted-parameters.rs:24:23 + --> $DIR/inverted-parameters.rs:26:23 | LL | fn missing_colon(quux S) {} | -----^ diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.stderr b/src/test/ui/parser/omitted-arg-in-item-fn.stderr index 4f2a76d2d25..e501f235d6d 100644 --- a/src/test/ui/parser/omitted-arg-in-item-fn.stderr +++ b/src/test/ui/parser/omitted-arg-in-item-fn.stderr @@ -3,6 +3,16 @@ error: expected one of `:` or `@`, found `)` | LL | fn foo(x) { | ^ expected one of `:` or `@` here + | + = note: anonymous parameters are removed in the 2018 edition (see RFC 1685) +help: if this was a parameter name, give it a type + | +LL | fn foo(x: TypeName) { + | ^^^^^^^^^^^ +help: if this is a type, explicitly ignore the parameter name + | +LL | fn foo(_: x) { + | ^^^^ error: aborting due to previous error |