bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

inline format!() args up to and including rustc_middle

Browse source
This commit is contained in:
Matthias Krüger 2023-07-25 22:00:13 +02:00
parent 2e0136a131
commit 23815467a2
87 changed files with 378 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_errors/src/emitter.rs
View file

@ -2145,7 +2145,7 @@ impl EmitterWriter {
&mut self.dst,
self.short_message,
) {
panic!("failed to emit error: {}", e)
panic!("failed to emit error: {e}")
}
}
if !self.short_message {
@ -2161,7 +2161,7 @@ impl EmitterWriter {
true,
None,
) {
panic!("failed to emit error: {}", err);
panic!("failed to emit error: {err}");
}
}
for sugg in suggestions {
@ -2180,7 +2180,7 @@ impl EmitterWriter {
true,
None,
) {
panic!("failed to emit error: {}", e);
panic!("failed to emit error: {e}");
}
}
SuggestionStyle::HideCodeInline
@ -2193,22 +2193,22 @@ impl EmitterWriter {
&Level::Help,
max_line_num_len,
) {
panic!("failed to emit error: {}", e);
panic!("failed to emit error: {e}");
}
}
}
}
}
}
Err(e) => panic!("failed to emit error: {}", e),
Err(e) => panic!("failed to emit error: {e}"),
}
let mut dst = self.dst.writable();
match writeln!(dst) {
Err(e) => panic!("failed to emit error: {}", e),
Err(e) => panic!("failed to emit error: {e}"),
_ => {
if let Err(e) = dst.flush() {
panic!("failed to emit error: {}", e)
panic!("failed to emit error: {e}")
}
}
}

8
compiler/rustc_errors/src/json.rs
View file

@ -159,7 +159,7 @@ impl Emitter for JsonEmitter {
}
.and_then(|_| self.dst.flush());
if let Err(e) = result {
panic!("failed to print diagnostics: {:?}", e);
panic!("failed to print diagnostics: {e:?}");
}
}
@ -172,7 +172,7 @@ impl Emitter for JsonEmitter {
}
.and_then(|_| self.dst.flush());
if let Err(e) = result {
panic!("failed to print notification: {:?}", e);
panic!("failed to print notification: {e:?}");
}
}
@ -194,7 +194,7 @@ impl Emitter for JsonEmitter {
}
.and_then(|_| self.dst.flush());
if let Err(e) = result {
panic!("failed to print future breakage report: {:?}", e);
panic!("failed to print future breakage report: {e:?}");
}
}
@ -208,7 +208,7 @@ impl Emitter for JsonEmitter {
}
.and_then(|_| self.dst.flush());
if let Err(e) = result {
panic!("failed to print unused externs: {:?}", e);
panic!("failed to print unused externs: {e:?}");
}
}

8
compiler/rustc_errors/src/lib.rs
View file

@ -1720,13 +1720,11 @@ impl HandlerInner {
(count, delayed_count, as_bug) => {
if delayed_count > 0 {
panic!(
"aborting after {} errors and {} delayed bugs due to `-Z treat-err-as-bug={}`",
count, delayed_count, as_bug,
"aborting after {count} errors and {delayed_count} delayed bugs due to `-Z treat-err-as-bug={as_bug}`",
)
} else {
panic!(
"aborting after {} errors due to `-Z treat-err-as-bug={}`",
count, as_bug,
"aborting after {count} errors due to `-Z treat-err-as-bug={as_bug}`",
)
}
}
@ -1862,7 +1860,7 @@ pub fn add_elided_lifetime_in_path_suggestion(
}
let anon_lts = vec!["'_"; n].join(", ");
let suggestion =
if incl_angl_brckt { format!("<{}>", anon_lts) } else { format!("{}, ", anon_lts) };
if incl_angl_brckt { format!("<{anon_lts}>") } else { format!("{anon_lts}, ") };
diag.subdiagnostic(IndicateAnonymousLifetime {
span: insertion_span.shrink_to_hi(),