nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid &format in error message code

Browse Source
This commit is contained in:
Takayuki Maeda 2023-06-23 02:17:39 +09:00
parent 0c2c243342
commit c8960622a2
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_borrowck/src/borrowck_errors.rs
View File

@ -278,7 +278,7 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
move_from_span: Span, move_from_span: Span,
move_from_desc: &str, move_from_desc: &str,
) -> DiagnosticBuilder<'cx, ErrorGuaranteed> { ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
struct_span_err!(self, move_from_span, E0507, "cannot move out of {}", move_from_desc,) struct_span_err!(self, move_from_span, E0507, "cannot move out of {}", move_from_desc)
} }
/// Signal an error due to an attempt to move out of the interior /// Signal an error due to an attempt to move out of the interior

10
compiler/rustc_macros/src/diagnostics/error.rs
View File

@ -54,7 +54,7 @@ fn path_to_string(path: &syn::Path) -> String {
/// Returns an error diagnostic on span `span` with msg `msg`. /// Returns an error diagnostic on span `span` with msg `msg`.
#[must_use] #[must_use]
pub(crate) fn span_err(span: impl MultiSpan, msg: &str) -> Diagnostic { pub(crate) fn span_err<T: Into<String>>(span: impl MultiSpan, msg: T) -> Diagnostic {
Diagnostic::spanned(span, Level::Error, msg) Diagnostic::spanned(span, Level::Error, msg)
} }
@ -77,11 +77,9 @@ pub(crate) fn invalid_attr(attr: &Attribute) -> Diagnostic {
let span = attr.span().unwrap(); let span = attr.span().unwrap();
let path = path_to_string(attr.path()); let path = path_to_string(attr.path());
match attr.meta { match attr.meta {
Meta::Path(_) => span_err(span, &format!("`#[{path}]` is not a valid attribute")), Meta::Path(_) => span_err(span, format!("`#[{path}]` is not a valid attribute")),
Meta::NameValue(_) => { Meta::NameValue(_) => span_err(span, format!("`#[{path} = ...]` is not a valid attribute")),
span_err(span, &format!("`#[{path} = ...]` is not a valid attribute")) Meta::List(_) => span_err(span, format!("`#[{path}(...)]` is not a valid attribute")),
}
Meta::List(_) => span_err(span, &format!("`#[{path}(...)]` is not a valid attribute")),
} }
} }

2
compiler/rustc_macros/src/diagnostics/subdiagnostic.rs
View File

@ -200,7 +200,7 @@ impl<'parent, 'a> SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
throw_span_err!( throw_span_err!(
attr.span().unwrap(), attr.span().unwrap(),
&format!( format!(
"diagnostic slug must be first argument of a `#[{name}(...)]` attribute" "diagnostic slug must be first argument of a `#[{name}(...)]` attribute"
) )
); );

2
compiler/rustc_macros/src/diagnostics/utils.rs
View File

@ -347,7 +347,7 @@ pub(crate) trait HasFieldMap {
None => { None => {
span_err( span_err(
span.unwrap(), span.unwrap(),
&format!("`{field}` doesn't refer to a field on this type"), format!("`{field}` doesn't refer to a field on this type"),
) )
.emit(); .emit();
quote! { quote! {