bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat
-rw-r--r--crates/hir-def/src/body/pretty.rs6
-rw-r--r--crates/hir-def/src/import_map.rs18
-rw-r--r--crates/hir-def/src/item_scope.rs2
-rw-r--r--crates/hir-def/src/item_tree/pretty.rs4
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mod.rs2
5 files changed, 15 insertions, 17 deletions
diff --git a/crates/hir-def/src/body/pretty.rs b/crates/hir-def/src/body/pretty.rs
index b821b91b89..4afb408651 100644
--- a/crates/hir-def/src/body/pretty.rs
+++ b/crates/hir-def/src/body/pretty.rs
@@ -29,11 +29,11 @@ pub(super) fn print_body_hir(db: &dyn DefDatabase, body: &Body, owner: DefWithBo
"const {} = ",
match &it.name {
Some(name) => name.display(db.upcast()).to_string(),
- None => "_".to_string(),
+ None => "_".to_owned(),
}
)
}),
- DefWithBodyId::InTypeConstId(_) => "In type const = ".to_string(),
+ DefWithBodyId::InTypeConstId(_) => "In type const = ".to_owned(),
DefWithBodyId::VariantId(it) => {
let loc = it.lookup(db);
let enum_loc = loc.parent.lookup(db);
@@ -123,7 +123,7 @@ impl Printer<'_> {
wln!(self);
f(self);
self.indent_level -= 1;
- self.buf = self.buf.trim_end_matches('\n').to_string();
+ self.buf = self.buf.trim_end_matches('\n').to_owned();
}
fn whitespace(&mut self) {
diff --git a/crates/hir-def/src/import_map.rs b/crates/hir-def/src/import_map.rs
index c698510ca9..98982c7db8 100644
--- a/crates/hir-def/src/import_map.rs
+++ b/crates/hir-def/src/import_map.rs
@@ -859,7 +859,7 @@ mod tests {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string()).fuzzy(),
+ Query::new("fmt".to_owned()).fuzzy(),
expect![[r#"
dep::fmt (t)
dep::fmt::Display::FMT_CONST (a)
@@ -888,9 +888,7 @@ mod tests {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string())
- .fuzzy()
- .assoc_search_mode(AssocSearchMode::AssocItemsOnly),
+ Query::new("fmt".to_owned()).fuzzy().assoc_search_mode(AssocSearchMode::AssocItemsOnly),
expect![[r#"
dep::fmt::Display::FMT_CONST (a)
dep::fmt::Display::format_function (a)
@@ -901,7 +899,7 @@ mod tests {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string()).fuzzy().assoc_search_mode(AssocSearchMode::Exclude),
+ Query::new("fmt".to_owned()).fuzzy().assoc_search_mode(AssocSearchMode::Exclude),
expect![[r#"
dep::fmt (t)
"#]],
@@ -937,7 +935,7 @@ pub mod fmt {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string()).fuzzy(),
+ Query::new("fmt".to_owned()).fuzzy(),
expect![[r#"
dep::Fmt (m)
dep::Fmt (t)
@@ -951,7 +949,7 @@ pub mod fmt {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string()),
+ Query::new("fmt".to_owned()),
expect![[r#"
dep::Fmt (m)
dep::Fmt (t)
@@ -991,7 +989,7 @@ pub mod fmt {
check_search(
ra_fixture,
"main",
- Query::new("fmt".to_string()),
+ Query::new("fmt".to_owned()),
expect![[r#"
dep::Fmt (m)
dep::Fmt (t)
@@ -1015,7 +1013,7 @@ pub mod fmt {
check_search(
ra_fixture,
"main",
- Query::new("FMT".to_string()),
+ Query::new("FMT".to_owned()),
expect![[r#"
dep::FMT (t)
dep::FMT (v)
@@ -1027,7 +1025,7 @@ pub mod fmt {
check_search(
ra_fixture,
"main",
- Query::new("FMT".to_string()).case_sensitive(),
+ Query::new("FMT".to_owned()).case_sensitive(),
expect![[r#"
dep::FMT (t)
dep::FMT (v)
diff --git a/crates/hir-def/src/item_scope.rs b/crates/hir-def/src/item_scope.rs
index 4bd2801aaf..0e6826a75a 100644
--- a/crates/hir-def/src/item_scope.rs
+++ b/crates/hir-def/src/item_scope.rs
@@ -672,7 +672,7 @@ impl ItemScope {
format_to!(
buf,
"{}:",
- name.map_or("_".to_string(), |name| name.display(db).to_string())
+ name.map_or("_".to_owned(), |name| name.display(db).to_string())
);
if let Some((.., i)) = def.types {
diff --git a/crates/hir-def/src/item_tree/pretty.rs b/crates/hir-def/src/item_tree/pretty.rs
index 520034d213..0086b7180b 100644
--- a/crates/hir-def/src/item_tree/pretty.rs
+++ b/crates/hir-def/src/item_tree/pretty.rs
@@ -24,7 +24,7 @@ pub(super) fn print_item_tree(db: &dyn DefDatabase, tree: &ItemTree) -> String {
p.print_mod_item(*item);
}
- let mut s = p.buf.trim_end_matches('\n').to_string();
+ let mut s = p.buf.trim_end_matches('\n').to_owned();
s.push('\n');
s
}
@@ -58,7 +58,7 @@ impl Printer<'_> {
wln!(self);
f(self);
self.indent_level -= 1;
- self.buf = self.buf.trim_end_matches('\n').to_string();
+ self.buf = self.buf.trim_end_matches('\n').to_owned();
}
/// Ensures that a blank line is output before the next text.
diff --git a/crates/hir-def/src/macro_expansion_tests/mod.rs b/crates/hir-def/src/macro_expansion_tests/mod.rs
index e315414e9b..fc5a6e80a4 100644
--- a/crates/hir-def/src/macro_expansion_tests/mod.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mod.rs
@@ -224,7 +224,7 @@ fn reindent(indent: IndentLevel, pp: String) -> String {
return pp;
}
let mut lines = pp.split_inclusive('\n');
- let mut res = lines.next().unwrap().to_string();
+ let mut res = lines.next().unwrap().to_owned();
for line in lines {
if line.trim().is_empty() {
res.push_str(line)