Skip to content

Commit

Permalink
Fix mispositioned error indicators
Browse files Browse the repository at this point in the history
Fixes #38384

Most of the Rust community uses 4 spaces for indentation,
but there are also tab users of Rust (including myself!).

This patch fixes a bug in error printing which mispositions
error indicators when near code with tabs.

The code attempted to fix the issue by replacing spaces
with tabs, but it sadly wasn't enough, as sometimes
you may not print spaces but _ or ^ instead.

This patch employs the reverse strategy: it replaces each
tab with a space, so that the number of _ and ^ and spaces
in error indicators below the code snippet line up
perfectly.

In a study [1] preceeding this patch, we could see that
this strategy is also chosen by gcc version 6.3.0.

Its not perfect, as the output is not beautiful, but its
the easiest to implement. If anyone wants to improve on
this, be my guest! This patch is meant as improvement of
the status quo, not as perfect end status. It fixes the
actual issue of mispositioning error indicators.

[1]: #38384 (comment)
  • Loading branch information
est31 committed Sep 7, 2017
1 parent 05e3c96 commit d582810
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 13 deletions.
17 changes: 7 additions & 10 deletions src/librustc_errors/styled_buffer.rs
Expand Up @@ -26,14 +26,11 @@ impl StyledBuffer {
}
}

pub fn copy_tabs(&mut self, row: usize) {
if row < self.text.len() {
for i in row + 1..self.text.len() {
for j in 0..self.text[i].len() {
if self.text[row].len() > j && self.text[row][j] == '\t' &&
self.text[i][j] == ' ' {
self.text[i][j] = '\t';
}
fn replace_tabs(&mut self) {
for line in self.text.iter_mut() {
for c in line.iter_mut() {
if *c == '\t' {
*c = ' ';
}
}
}
Expand All @@ -43,8 +40,8 @@ impl StyledBuffer {
let mut output: Vec<Vec<StyledString>> = vec![];
let mut styled_vec: Vec<StyledString> = vec![];

// before we render, do a little patch-up work to support tabs
self.copy_tabs(3);
// before we render, replace tabs with spaces
self.replace_tabs();

for (row, row_style) in self.text.iter().zip(&self.styles) {
let mut current_style = Style::NoStyle;
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/codemap_tests/tab.rs
Expand Up @@ -13,3 +13,7 @@
fn main() {
bar;
}

fn foo() {
"bar boo"
}
17 changes: 14 additions & 3 deletions src/test/ui/codemap_tests/tab.stderr
@@ -1,8 +1,19 @@
error[E0425]: cannot find value `bar` in this scope
--> $DIR/tab.rs:14:2
|
14 | \tbar;
| \t^^^ not found in this scope
14 | bar;
| ^^^ not found in this scope

error: aborting due to previous error
error[E0308]: mismatched types
--> $DIR/tab.rs:18:2
|
17 | fn foo() {
| - help: try adding a return type: `-> &'static str `
18 | "bar boo"
| ^^^^^^^^^^^ expected (), found reference
|
= note: expected type `()`
found type `&'static str`

error: aborting due to 2 previous errors

15 changes: 15 additions & 0 deletions src/test/ui/codemap_tests/tab_2.rs
@@ -0,0 +1,15 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-tidy-tab

fn main() {
""";
}
10 changes: 10 additions & 0 deletions src/test/ui/codemap_tests/tab_2.stderr
@@ -0,0 +1,10 @@
error: unterminated double quote string
--> $DIR/tab_2.rs:14:7
|
14 | """;
| _______^
15 | | }
| |__^

error: aborting due to previous error

19 changes: 19 additions & 0 deletions src/test/ui/codemap_tests/tab_3.rs
@@ -0,0 +1,19 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-tidy-tab

fn main() {
let some_vec = vec!["hi"];
some_vec.into_iter();
{
println!("{:?}", some_vec);
}
}
13 changes: 13 additions & 0 deletions src/test/ui/codemap_tests/tab_3.stderr
@@ -0,0 +1,13 @@
error[E0382]: use of moved value: `some_vec`
--> $DIR/tab_3.rs:17:20
|
15 | some_vec.into_iter();
| -------- value moved here
16 | {
17 | println!("{:?}", some_vec);
| ^^^^^^^^ value used here after move
|
= note: move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait

error: aborting due to previous error

0 comments on commit d582810

Please sign in to comment.