Use Cow
in {D,Subd}iagnosticMessage
.
Each of `{D,Subd}iagnosticMessage::{Str,Eager}` has a comment: ``` // FIXME(davidtwco): can a `Cow<'static, str>` be used here? ``` This commit answers that question in the affirmative. It's not the most compelling change ever, but it might be worth merging. This requires changing the `impl<'a> From<&'a str>` impls to `impl From<&'static str>`, which involves a bunch of knock-on changes that require/result in call sites being a little more precise about exactly what kind of string they use to create errors, and not just `&str`. This will result in fewer unnecessary allocations, though this will not have any notable perf effects given that these are error paths. Note that I was lazy within Clippy, using `to_string` in a few places to preserve the existing string imprecision. I could have used `impl Into<{D,Subd}iagnosticMessage>` in various places as is done in the compiler, but that would have required changes to *many* call sites (mostly changing `&format("...")` to `format!("...")`) which didn't seem worthwhile.
This commit is contained in:
parent
1c53407e8c
commit
781111ef35
45 changed files with 308 additions and 287 deletions
|
@ -628,7 +628,7 @@ impl Handler {
|
|||
message: DiagnosticMessage,
|
||||
args: impl Iterator<Item = DiagnosticArg<'a, 'static>>,
|
||||
) -> SubdiagnosticMessage {
|
||||
SubdiagnosticMessage::Eager(self.eagerly_translate_to_string(message, args))
|
||||
SubdiagnosticMessage::Eager(Cow::from(self.eagerly_translate_to_string(message, args)))
|
||||
}
|
||||
|
||||
/// Translate `message` eagerly with `args` to `String`.
|
||||
|
@ -1450,14 +1450,14 @@ impl HandlerInner {
|
|||
self.emit_stashed_diagnostics();
|
||||
|
||||
let warnings = match self.deduplicated_warn_count {
|
||||
0 => String::new(),
|
||||
1 => "1 warning emitted".to_string(),
|
||||
count => format!("{count} warnings emitted"),
|
||||
0 => Cow::from(""),
|
||||
1 => Cow::from("1 warning emitted"),
|
||||
count => Cow::from(format!("{count} warnings emitted")),
|
||||
};
|
||||
let errors = match self.deduplicated_err_count {
|
||||
0 => String::new(),
|
||||
1 => "aborting due to previous error".to_string(),
|
||||
count => format!("aborting due to {count} previous errors"),
|
||||
0 => Cow::from(""),
|
||||
1 => Cow::from("aborting due to previous error"),
|
||||
count => Cow::from(format!("aborting due to {count} previous errors")),
|
||||
};
|
||||
if self.treat_err_as_bug() {
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue