Skip to content

Commit 70e04bd

Browse files
committedMay 29, 2023
Auto merge of #111748 - nnethercote:Cow-DiagnosticMessage, r=WaffleLapkin
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. r? `@WaffleLapkin`
2 parents dc0943d + 781111e commit 70e04bd

File tree

45 files changed

+308
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+308
-287
lines changed
 

‎compiler/rustc_builtin_macros/src/compile_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn expand_compile_error<'cx>(
1818
reason = "diagnostic message is specified by user"
1919
)]
2020
#[expect(rustc::untranslatable_diagnostic, reason = "diagnostic message is specified by user")]
21-
cx.span_err(sp, var.as_str());
21+
cx.span_err(sp, var.to_string());
2222

2323
DummyResult::any(sp)
2424
}

‎compiler/rustc_builtin_macros/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for EnvNotDefined {
377377
rustc::untranslatable_diagnostic,
378378
reason = "cannot translate user-provided messages"
379379
)]
380-
handler.struct_diagnostic(msg.as_str())
380+
handler.struct_diagnostic(msg.to_string())
381381
} else {
382382
handler.struct_diagnostic(crate::fluent_generated::builtin_macros_env_not_defined)
383383
};

0 commit comments

Comments
 (0)
Please sign in to comment.