From e63c00f100e960f7b72997026b4b2cd3cd29774b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 5 Jun 2020 14:55:23 +0200
Subject: Rename resolve_relative_path -> resolve_path

For things like `concant!(env!("OUT_DIR"))`, we need to support abs paths
---
 crates/ra_db/src/lib.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'crates/ra_db')

diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index fd4280de2..07e1b8aba 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -89,8 +89,7 @@ pub const DEFAULT_LRU_CAP: usize = 128;
 pub trait FileLoader {
     /// Text of the file.
     fn file_text(&self, file_id: FileId) -> Arc<String>;
-    fn resolve_relative_path(&self, anchor: FileId, relative_path: &RelativePath)
-        -> Option<FileId>;
+    fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId>;
     fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>>;
 
     fn resolve_extern_path(
@@ -155,11 +154,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
     fn file_text(&self, file_id: FileId) -> Arc<String> {
         SourceDatabaseExt::file_text(self.0, file_id)
     }
-    fn resolve_relative_path(
-        &self,
-        anchor: FileId,
-        relative_path: &RelativePath,
-    ) -> Option<FileId> {
+    fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
         let path = {
             let mut path = self.0.file_relative_path(anchor);
             assert!(path.pop());
-- 
cgit v1.2.3