bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

repairing broken error message and rustfix application for the new test

Browse source 
case
This commit is contained in:
Aurélien Deharbe 2020-09-11 17:31:52 +02:00
parent f9059a41b4
commit 62068a59ee
4 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_parse/src/parser/mod.rs
View file

@ -694,9 +694,13 @@ impl<'a> Parser<'a> {
Ok(t) => {
// Parsed successfully, therefore most probably the code only
// misses a separator.
let mut exp_span = self.sess.source_map().next_point(sp);
if self.sess.source_map().is_multiline(exp_span) {
exp_span = sp;
}
expect_err
.span_suggestion_short(
self.sess.source_map().next_point(sp),
exp_span,
&format!("missing `{}`", token_str),
token_str,
Applicability::MaybeIncorrect,

11
src/test/ui/issue-76597.fixed Normal file
View file

@ -0,0 +1,11 @@
// run-rustfix
#![allow(dead_code)]
#![allow(unused_variables)]
fn f(
x: u8,
y: u8,
) {}
//~^^ ERROR: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `y`
fn main() {}

4
src/test/ui/issue-76597.rs
View file

@ -1,3 +1,7 @@
// run-rustfix
#![allow(dead_code)]
#![allow(unused_variables)]
fn f(
x: u8
y: u8,

17
src/test/ui/issue-76597.stderr
View file

@ -1,14 +1,13 @@
error: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `y`
--> $DIR/issue-76597.rs:3:38
--> $DIR/issue-76597.rs:7:38
|
LL | ... x: u8
| - expected one of 7 possible tokens
| ____________________________|
| |
LL | | ... y: u8,
| | | ^ unexpected token
| | |
| help: missing `,`
LL | ... x: u8
| -
| |
| expected one of 7 possible tokens
| help: missing `,`
LL | ... y: u8,
| ^ unexpected token
error: aborting due to previous error