diff options
| author | bors <bors@rust-lang.org> | 2023-04-21 05:54:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-21 05:54:13 +0000 |
| commit | b92a41c6760801a7128ca0ec69ba4ba9c9194054 (patch) | |
| tree | 15f0278bd32303a444414f77da5dc49ea1d83b14 /compiler/rustc_errors/src | |
| parent | 77778e075d225f1a72523fe7bec6b76e24260692 (diff) | |
| parent | 77de5f0754bbd7d6e973eb7544cfacb11901bdbc (diff) | |
| download | rust-b92a41c6760801a7128ca0ec69ba4ba9c9194054.tar.gz rust-b92a41c6760801a7128ca0ec69ba4ba9c9194054.zip | |
Auto merge of #110636 - matthiaskrgr:rollup-faa33c6, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #110365 (ship tools with sysroot) - #110555 (Substitute missing trait items suggestion correctly) - #110578 (fix(error): normalize whitespace during msg_to_buffer) - #110597 (remove unused ftl messages) - #110611 (Add regression test for #46506) - #110618 (Track if EvalCtxt has been tainted, make sure it can't be used to make query responses after) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 8c76d5e010f..2498ae2b7bc 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -1336,6 +1336,7 @@ impl EmitterWriter { // see? for (text, style) in msg.iter() { let text = self.translate_message(text, args).map_err(Report::new).unwrap(); + let text = &normalize_whitespace(&text); let lines = text.split('\n').collect::<Vec<_>>(); if lines.len() > 1 { for (i, line) in lines.iter().enumerate() { |