bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

avoid &str to String conversions

Browse source
This commit is contained in:
Takayuki Maeda 2022-07-20 18:19:57 +09:00
parent 57a155b9fa
commit 56e7777755
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_errors/src/diagnostic.rs
View file

@ -390,18 +390,17 @@ impl Diagnostic {
expected: DiagnosticStyledString, expected: DiagnosticStyledString,
found: DiagnosticStyledString, found: DiagnosticStyledString,
) -> &mut Self { ) -> &mut Self {
let mut msg: Vec<_> = let mut msg: Vec<_> = vec![("required when trying to coerce from type `", Style::NoStyle)];
vec![("required when trying to coerce from type `".to_string(), Style::NoStyle)];
msg.extend(expected.0.iter().map(|x| match *x { msg.extend(expected.0.iter().map(|x| match *x {
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle), StringPart::Normal(ref s) => (s.as_str(), Style::NoStyle),
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight), 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 { msg.extend(found.0.iter().map(|x| match *x {
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle), StringPart::Normal(ref s) => (s.as_str(), Style::NoStyle),
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight), 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 // For now, just attach these as notes
self.highlighted_note(msg); self.highlighted_note(msg);

4
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -2603,9 +2603,9 @@ fn show_candidates(
.skip(1) .skip(1)
.all(|(_, descr, _, _)| descr == descr_first) .all(|(_, descr, _, _)| descr == descr_first)
{ {
descr_first.to_string() descr_first
} else { } else {
"item".to_string() "item"
}; };
let plural_descr = let plural_descr =
if descr.ends_with("s") { format!("{}es", descr) } else { format!("{}s", descr) }; if descr.ends_with("s") { format!("{}es", descr) } else { format!("{}s", descr) };