Rollup merge of #110578 - bvanjoi:fix-issue-110547, r=jackh726

fix(error): normalize whitespace during msg_to_buffer

close https://github.com/rust-lang/rust/issues/110547
This commit is contained in:
Matthias Krüger 2023-04-21 06:44:30 +02:00 committed by GitHub
commit 637d9ddc35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 0 deletions

View file

@ -1336,6 +1336,7 @@ fn style_or_override(style: Style, override_: Option<Style>) -> Style {
// 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() {

View file

@ -0,0 +1,7 @@
// compile-flags: -C debug-assertions
fn main() {
env!{"\t"}; //~ ERROR not defined at compile time
env!("\t"); //~ ERROR not defined at compile time
env!("\u{2069}"); //~ ERROR not defined at compile time
}

View file

@ -0,0 +1,29 @@
error: environment variable ` ` not defined at compile time
--> $DIR/issue-110547.rs:4:5
|
LL | env!{"\t"};
| ^^^^^^^^^^
|
= help: use `std::env::var(" ")` to read the variable at run time
= note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info)
error: environment variable ` ` not defined at compile time
--> $DIR/issue-110547.rs:5:5
|
LL | env!("\t");
| ^^^^^^^^^^
|
= help: use `std::env::var(" ")` to read the variable at run time
= note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info)
error: environment variable `` not defined at compile time
--> $DIR/issue-110547.rs:6:5
|
LL | env!("\u{2069}");
| ^^^^^^^^^^^^^^^^
|
= help: use `std::env::var("")` to read the variable at run time
= note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 3 previous errors