From 6263aa13d0eed983827d14fa39bf6490eb27e7a5 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Wed, 3 Jul 2019 22:17:43 +0300 Subject: Fixed request changes --- crates/ra_hir/src/name.rs | 8 ++++---- crates/ra_hir/src/nameres/tests.rs | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/ra_hir/src/name.rs b/crates/ra_hir/src/name.rs index 0bb7cae99..06a2dbc76 100644 --- a/crates/ra_hir/src/name.rs +++ b/crates/ra_hir/src/name.rs @@ -98,14 +98,14 @@ pub(crate) trait AsName { impl AsName for ast::NameRef { fn as_name(&self) -> Name { - let name = resolve_name(self.text().clone()); + let name = resolve_name(self.text()); Name::new(name) } } impl AsName for ast::Name { fn as_name(&self) -> Name { - let name = resolve_name(self.text().clone()); + let name = resolve_name(self.text()); Name::new(name) } } @@ -187,11 +187,11 @@ impl AsName for KnownName { } } -fn resolve_name(text: SmolStr) -> SmolStr { +fn resolve_name(text: &SmolStr) -> SmolStr { let raw_start = "r#"; if text.as_str().starts_with(raw_start) { SmolStr::new(&text[raw_start.len()..]) } else { - text + text.clone() } } diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs index 78332ce7c..07b533e29 100644 --- a/crates/ra_hir/src/nameres/tests.rs +++ b/crates/ra_hir/src/nameres/tests.rs @@ -340,7 +340,7 @@ fn module_resolution_works_for_non_standard_filenames() { #[test] fn module_resolution_works_for_raw_modules() { - let map = def_map_with_crate_graph( + let map = def_map_with_crate_graph( " //- /library.rs mod r#async; @@ -362,7 +362,6 @@ fn module_resolution_works_for_raw_modules() { ⋮crate::async ⋮Bar: t v "###); - } #[test] -- cgit v1.2.3