diff options
| author | bors <bors@rust-lang.org> | 2021-03-30 17:07:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-30 17:07:19 +0000 |
| commit | 926ec1cb8b81ac47ba2e5b8a6780e95d39241afa (patch) | |
| tree | 0c129ef23845acbccd2d4acbe3609a9c4191aa8c | |
| parent | 7b6fc5a3dd73a341010bd51a19008ed679cd1475 (diff) | |
| parent | 8d7432af7bd82ae5a9c06983d51a03438cf1b625 (diff) | |
| download | rust-926ec1cb8b81ac47ba2e5b8a6780e95d39241afa.tar.gz rust-926ec1cb8b81ac47ba2e5b8a6780e95d39241afa.zip | |
Auto merge of #83639 - osa1:issue83638, r=estebank
Replace tabs in err messages before rendering This is done in other call sites, but was missing in one place. Fixes #83638
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/issue-83639.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/issue-83639.stderr | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 633c64af3c5..8ec06feb5bf 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -1258,7 +1258,7 @@ impl EmitterWriter { buffer.append(0, ": ", header_style); } for &(ref text, _) in msg.iter() { - buffer.append(0, text, header_style); + buffer.append(0, &replace_tabs(text), header_style); } } diff --git a/src/test/ui/issue-83639.rs b/src/test/ui/issue-83639.rs new file mode 100644 index 00000000000..6ddbedfa0bc --- /dev/null +++ b/src/test/ui/issue-83639.rs @@ -0,0 +1,6 @@ +// check-fail +// ignore-tidy-tab + +fn main() { + """ " //~ ERROR +} diff --git a/src/test/ui/issue-83639.stderr b/src/test/ui/issue-83639.stderr new file mode 100644 index 00000000000..4c10df1917c --- /dev/null +++ b/src/test/ui/issue-83639.stderr @@ -0,0 +1,8 @@ +error: expected one of `.`, `;`, `?`, `}`, or an operator, found `" "` + --> $DIR/issue-83639.rs:5:7 + | +LL | """ " + | ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator + +error: aborting due to previous error + |