rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed request changes

Browse Source
This commit is contained in:
Alexander Andreev
2019-07-03 22:17:43 +03:00
parent 02e9e46ed6
commit 6263aa13d0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_hir/src/name.rs
View File

@@ -98,14 +98,14 @@ pub(crate) trait AsName {
impl AsName for ast::NameRef { impl AsName for ast::NameRef {
fn as_name(&self) -> Name { fn as_name(&self) -> Name {
let name = resolve_name(self.text().clone()); let name = resolve_name(self.text());
Name::new(name) Name::new(name)
} }
} }
impl AsName for ast::Name { impl AsName for ast::Name {
fn as_name(&self) -> Name { fn as_name(&self) -> Name {
let name = resolve_name(self.text().clone()); let name = resolve_name(self.text());
Name::new(name) 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#"; let raw_start = "r#";
if text.as_str().starts_with(raw_start) { if text.as_str().starts_with(raw_start) {
SmolStr::new(&text[raw_start.len()..]) SmolStr::new(&text[raw_start.len()..])
} else { } else {
text text.clone()
} }
} }

3
crates/ra_hir/src/nameres/tests.rs
View File

@@ -340,7 +340,7 @@ fn module_resolution_works_for_non_standard_filenames() {
#[test] #[test]
fn module_resolution_works_for_raw_modules() { fn module_resolution_works_for_raw_modules() {
let map = def_map_with_crate_graph( let map = def_map_with_crate_graph(
" "
//- /library.rs //- /library.rs
mod r#async; mod r#async;
@@ -362,7 +362,6 @@ fn module_resolution_works_for_raw_modules() {
⋮crate::async ⋮crate::async
⋮Bar: t v ⋮Bar: t v
"###); "###);
} }
#[test] #[test]