diff options
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index e11198e02..ef4d1ed70 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -643,7 +643,6 @@ fn resolve_submodule( | |||
643 | let mod_name = path.file_stem().unwrap_or("unknown"); | 643 | let mod_name = path.file_stem().unwrap_or("unknown"); |
644 | let is_dir_owner = is_root || mod_name == "mod"; | 644 | let is_dir_owner = is_root || mod_name == "mod"; |
645 | 645 | ||
646 | let name = resolve_mod_name(name.to_string()); | ||
647 | let file_mod = dir_path.join(format!("{}.rs", name)); | 646 | let file_mod = dir_path.join(format!("{}.rs", name)); |
648 | let dir_mod = dir_path.join(format!("{}/mod.rs", name)); | 647 | let dir_mod = dir_path.join(format!("{}/mod.rs", name)); |
649 | let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name)); | 648 | let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name)); |
@@ -663,14 +662,6 @@ fn resolve_submodule( | |||
663 | } | 662 | } |
664 | } | 663 | } |
665 | 664 | ||
666 | fn resolve_mod_name(name: String) -> String { | ||
667 | if name.starts_with("r#") { | ||
668 | name.replace("r#", "") | ||
669 | } else { | ||
670 | name | ||
671 | } | ||
672 | } | ||
673 | |||
674 | #[cfg(test)] | 665 | #[cfg(test)] |
675 | mod tests { | 666 | mod tests { |
676 | use ra_db::SourceDatabase; | 667 | use ra_db::SourceDatabase; |