mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 23:04:33 +00:00
2d7795dfb9
No longer track "zero-width" chars in `SourceMap`, read directly from the line when calculating the `display_col` of a `BytePos`. Move `char_width` to `rustc_span` and use it from the emitter.
This change allows the following to properly align in terminals (depending on the font, the replaced control codepoints are rendered as 1 or 2 width, on my terminal they are rendered as 1, on VSCode text they are rendered as 2):
```
error: this file contains an unclosed delimiter
--> $DIR/issue-68629.rs:5:17
|
LL | ␜␟ts␀![{i
| -- unclosed delimiter
| |
| unclosed delimiter
LL | ␀␀ fn rݻoa>rݻm
| ^
```
17 lines
440 B
Plaintext
17 lines
440 B
Plaintext
error: this file contains an unclosed delimiter
|
|
--> $DIR/parser-recovery-1.rs:10:54
|
|
|
|
|
LL | trait Foo {
|
|
| - unclosed delimiter
|
|
LL | fn bar() {
|
|
| - this delimiter might not be properly closed...
|
|
LL | let x = foo();
|
|
LL | }
|
|
| - ...as it matches this but it has different indentation
|
|
...
|
|
LL | }
|
|
| ^
|
|
|
|
error: aborting due to 1 previous error
|
|
|