diff options
author | Aleksey Kladov <[email protected]> | 2020-06-05 13:55:23 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-06-05 13:58:30 +0100 |
commit | e63c00f100e960f7b72997026b4b2cd3cd29774b (patch) | |
tree | f789502d1e45282980e1eb8bfa1f5e96f45636b9 /crates/ra_hir_ty/src | |
parent | f98d057218ca30d052da2a119fa0b3108ba3a091 (diff) |
Rename resolve_relative_path -> resolve_path
For things like `concant!(env!("OUT_DIR"))`, we need to support abs paths
Diffstat (limited to 'crates/ra_hir_ty/src')
-rw-r--r-- | crates/ra_hir_ty/src/test_db.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs index 8498d3d96..43927c991 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/ra_hir_ty/src/test_db.rs | |||
@@ -72,12 +72,8 @@ impl FileLoader for TestDB { | |||
72 | fn file_text(&self, file_id: FileId) -> Arc<String> { | 72 | fn file_text(&self, file_id: FileId) -> Arc<String> { |
73 | FileLoaderDelegate(self).file_text(file_id) | 73 | FileLoaderDelegate(self).file_text(file_id) |
74 | } | 74 | } |
75 | fn resolve_relative_path( | 75 | fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> { |
76 | &self, | 76 | FileLoaderDelegate(self).resolve_path(anchor, relative_path) |
77 | anchor: FileId, | ||
78 | relative_path: &RelativePath, | ||
79 | ) -> Option<FileId> { | ||
80 | FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path) | ||
81 | } | 77 | } |
82 | fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { | 78 | fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { |
83 | FileLoaderDelegate(self).relevant_crates(file_id) | 79 | FileLoaderDelegate(self).relevant_crates(file_id) |