Skip to content

Fix #58270, fix off-by-one error in error diagnostics. #60160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2019
Merged

Fix #58270, fix off-by-one error in error diagnostics. #60160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/librustc_errors/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ impl EmitterWriter {
// 6..7. This is degenerate input, but it's best to degrade
// gracefully -- and the parser likes to supply a span like
// that for EOF, in particular.

if lo.col_display == hi.col_display && lo.line == hi.line {
hi.col_display += 1;
}
Expand Down Expand Up @@ -547,6 +548,15 @@ impl EmitterWriter {
&& j > i // multiline lines).
&& p == 0 // We're currently on the first line, move the label one line down
{
// If we're overlapping with an un-labelled annotation with the same span
// we can just merge them in the output
if next.start_col == annotation.start_col
&& next.end_col == annotation.end_col
&& !next.has_label()
{
continue;
}

// This annotation needs a new line in the output.
p += 1;
break;
Expand Down
4 changes: 1 addition & 3 deletions src/test/ui/issue-60075.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ LL | fn qux() -> Option<usize> {
| - unclosed delimiter
LL | let _ = if true {
LL | });
| ^
| |
| help: `}` may belong here
| ^ help: `}` may belong here

error: expected identifier, found `;`
--> $DIR/issue-60075.rs:6:11
Expand Down
5 changes: 2 additions & 3 deletions src/test/ui/issues/issue-58856-1.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ error: expected one of `)`, `,`, or `:`, found `>`
--> $DIR/issue-58856-1.rs:2:14
|
LL | fn b(self>
| - ^
| | |
| | help: `)` may belong here
| - ^ help: `)` may belong here
| |
| unclosed delimiter

error: aborting due to previous error
Expand Down
4 changes: 1 addition & 3 deletions src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ error[E0623]: lifetime mismatch
--> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:7:11
|
LL | fn foo(mut x: Ref) {
| ---
| |
| this type is declared with multiple lifetimes...
| --- this type is declared with multiple lifetimes...
LL | x.a = x.b;
| ^^^ ...but data with one lifetime flows into the other here

Expand Down
5 changes: 2 additions & 3 deletions src/test/ui/parser/issue-10636-2.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ error: expected one of `)`, `,`, `.`, `?`, or an operator, found `;`
--> $DIR/issue-10636-2.rs:5:25
|
LL | option.map(|some| 42;
| - ^
| | |
| | help: `)` may belong here
| - ^ help: `)` may belong here
| |
| unclosed delimiter

error: expected expression, found `)`
Expand Down
4 changes: 1 addition & 3 deletions src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ error[E0623]: lifetime mismatch
--> $DIR/regions-variance-contravariant-use-covariant-in-second-position.rs:25:30
|
LL | fn use_<'short,'long>(c: S<'long, 'short>,
| ----------------
| |
| this type is declared with multiple lifetimes...
| ---------------- this type is declared with multiple lifetimes...
...
LL | let _: S<'long, 'long> = c;
| ^ ...but data with one lifetime flows into the other here
Expand Down
5 changes: 2 additions & 3 deletions src/test/ui/resolve/token-error-correct-3.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ error: expected one of `)`, `,`, `.`, `?`, or an operator, found `;`
--> $DIR/token-error-correct-3.rs:15:35
|
LL | callback(path.as_ref();
| - ^
| | |
| | help: `)` may belong here
| - ^ help: `)` may belong here
| |
| unclosed delimiter

error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
Expand Down