diff --git a/crates/ra_analysis/tests/tests.rs b/crates/ra_analysis/tests/tests.rs index 889b568b9a5..67738da48f8 100644 --- a/crates/ra_analysis/tests/tests.rs +++ b/crates/ra_analysis/tests/tests.rs @@ -81,7 +81,7 @@ fn test_unresolved_module_diagnostic() { fix: Some(SourceChange { label: "create module", source_file_edits: [], - file_system_edits: [CreateFile { anchor: FileId(1), path: "../foo.rs" }], + file_system_edits: [CreateFile { source_root: SourceRootId(0), path: "foo.rs" }], cursor_position: None }) }]"#, &diagnostics, ); diff --git a/crates/ra_hir/src/module/imp.rs b/crates/ra_hir/src/module/imp.rs index f3a346152b9..748fdb64e2f 100644 --- a/crates/ra_hir/src/module/imp.rs +++ b/crates/ra_hir/src/module/imp.rs @@ -4,7 +4,7 @@ use ra_syntax::{ ast::{self, NameOwner}, SmolStr, }; -use relative_path::{RelativePathBuf, RelativePath}; +use relative_path::RelativePathBuf; use rustc_hash::{FxHashMap, FxHashSet}; use arrayvec::ArrayVec; use ra_db::{SourceRoot, SourceRootId, Cancelable, FileId}; @@ -184,11 +184,7 @@ fn resolve_submodule( .collect::>(); let problem = if points_to.is_empty() { Some(Problem::UnresolvedModule { - candidate: RelativePath::new("../").join(&if is_dir_owner { - file_mod - } else { - file_dir_mod - }), + candidate: if is_dir_owner { file_mod } else { file_dir_mod }, }) } else { None