From 57a155b9faf480ae0d1cc46ffc4b5e1a468bc65c Mon Sep 17 00:00:00 2001
From: Takayuki Maeda <takoyaki0316@gmail.com>
Date: Wed, 20 Jul 2022 18:19:25 +0900
Subject: [PATCH 1/2] avoid a `Symbol` to `String` conversion
---
compiler/rustc_builtin_macros/src/format.rs | 4 +---
compiler/rustc_lint_defs/src/lib.rs | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs
index 3b7e2102ffa9b..2d1fd81c32f86 100644
--- a/compiler/rustc_builtin_macros/src/format.rs
+++ b/compiler/rustc_builtin_macros/src/format.rs
@@ -1004,9 +1004,7 @@ fn lint_named_arguments_used_positionally(
node_id: ast::CRATE_NODE_ID,
lint_id: LintId::of(&NAMED_ARGUMENTS_USED_POSITIONALLY),
diagnostic: BuiltinLintDiagnostics::NamedArgumentUsedPositionally(
- arg_span,
- span,
- symbol.to_string(),
+ arg_span, span, symbol,
),
});
}
diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs
index 4fd57ed853379..3872d866dee86 100644
--- a/compiler/rustc_lint_defs/src/lib.rs
+++ b/compiler/rustc_lint_defs/src/lib.rs
@@ -467,7 +467,7 @@ pub enum BuiltinLintDiagnostics {
/// If true, the lifetime will be fully elided.
use_span: Option<(Span, bool)>,
},
- NamedArgumentUsedPositionally(Option<Span>, Span, String),
+ NamedArgumentUsedPositionally(Option<Span>, Span, Symbol),
}
/// Lints that are buffered up early on in the `Session` before the
From 56e7777755945041da1f898d1bd1887e554adce1 Mon Sep 17 00:00:00 2001
From: Takayuki Maeda <takoyaki0316@gmail.com>
Date: Wed, 20 Jul 2022 18:19:57 +0900
Subject: [PATCH 2/2] avoid `&str` to String conversions
---
compiler/rustc_errors/src/diagnostic.rs | 15 +++++++--------
compiler/rustc_resolve/src/diagnostics.rs | 4 ++--
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
index 7d7f3e1833576..ba888d77b15c1 100644
--- a/compiler/rustc_errors/src/diagnostic.rs
+++ b/compiler/rustc_errors/src/diagnostic.rs
@@ -390,18 +390,17 @@ impl Diagnostic {
expected: DiagnosticStyledString,
found: DiagnosticStyledString,
) -> &mut Self {
- let mut msg: Vec<_> =
- vec![("required when trying to coerce from type `".to_string(), Style::NoStyle)];
+ let mut msg: Vec<_> = vec![("required when trying to coerce from type `", Style::NoStyle)];
msg.extend(expected.0.iter().map(|x| match *x {
- StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
- StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
+ StringPart::Normal(ref s) => (s.as_str(), Style::NoStyle),
+ StringPart::Highlighted(ref s) => (s.as_str(), Style::Highlight),
}));
- msg.push(("` to type '".to_string(), Style::NoStyle));
+ msg.push(("` to type '", Style::NoStyle));
msg.extend(found.0.iter().map(|x| match *x {
- StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
- StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
+ StringPart::Normal(ref s) => (s.as_str(), Style::NoStyle),
+ StringPart::Highlighted(ref s) => (s.as_str(), Style::Highlight),
}));
- msg.push(("`".to_string(), Style::NoStyle));
+ msg.push(("`", Style::NoStyle));
// For now, just attach these as notes
self.highlighted_note(msg);
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
index 7a1695fc862bf..df13136dcce37 100644
--- a/compiler/rustc_resolve/src/diagnostics.rs
+++ b/compiler/rustc_resolve/src/diagnostics.rs
@@ -2603,9 +2603,9 @@ fn show_candidates(
.skip(1)
.all(|(_, descr, _, _)| descr == descr_first)
{
- descr_first.to_string()
+ descr_first
} else {
- "item".to_string()
+ "item"
};
let plural_descr =
if descr.ends_with("s") { format!("{}es", descr) } else { format!("{}s", descr) };