Merge pull request #1667 from rust-lang/no-abs-path

Fix nightly by implementing missing FileLoader::abs_path

Author: Xanewok

rls-ipc/src/rpc.rs

@@ -24,10 +24,6 @@ pub mod file_loader {
         #[rpc(name = "file_exists")]
         fn file_exists(&self, path: PathBuf) -> Result<bool>;
 
-        /// Returns an absolute path to a file, if possible.
-        #[rpc(name = "abs_path")]
-        fn abs_path(&self, path: PathBuf) -> Result<Option<PathBuf>>;
-
         /// Read the contents of an UTF-8 file into memory.
         #[rpc(name = "read_file")]
         fn read_file(&self, path: PathBuf) -> Result<String>;

rls-rustc/src/ipc.rs

@@ -34,10 +34,6 @@ impl rustc_span::source_map::FileLoader for IpcFileLoader {
         self.0.file_exists(path.to_owned()).wait().unwrap()
     }
 
-    fn abs_path(&self, path: &Path) -> Option<PathBuf> {
-        self.0.abs_path(path.to_owned()).wait().ok()?
-    }
-
     fn read_file(&self, path: &Path) -> io::Result<String> {
         self.0
             .read_file(path.to_owned())

rls/src/build/ipc.rs

@@ -140,24 +140,22 @@ pub struct ChangedFiles(HashMap<PathBuf, String>);
 
 impl rpc::file_loader::Rpc for ChangedFiles {
     fn file_exists(&self, path: PathBuf) -> RpcResult<bool> {
-        // Copied from syntax::source_map::RealFileLoader
         Ok(fs::metadata(path).is_ok())
     }
-    fn abs_path(&self, path: PathBuf) -> RpcResult<Option<PathBuf>> {
-        // Copied from syntax::source_map::RealFileLoader
-        Ok(if path.is_absolute() {
-            Some(path.to_path_buf())
-        } else {
-            env::current_dir().ok().map(|cwd| cwd.join(path))
-        })
-    }
+
     fn read_file(&self, path: PathBuf) -> RpcResult<String> {
-        if let Some(abs_path) = self.abs_path(path.clone()).ok().and_then(|x| x) {
-            if self.0.contains_key(&abs_path) {
-                return Ok(self.0[&abs_path].clone());
-            }
+        if let Some(contents) = abs_path(&path).and_then(|x| self.0.get(&x)) {
+            return Ok(contents.clone());
         }
 
         fs::read_to_string(path).map_err(|e| rpc_error(&e.to_string()))
     }
 }
+
+fn abs_path(path: &Path) -> Option<PathBuf> {
+    if path.is_absolute() {
+        Some(path.to_path_buf())
+    } else {
+        env::current_dir().ok().map(|cwd| cwd.join(path))
+    }
+}

rls/src/build/rustc.rs

@@ -367,20 +367,23 @@ impl FileLoader for ReplacedFileLoader {
         self.real_file_loader.file_exists(path)
     }
 
-    fn abs_path(&self, path: &Path) -> Option<PathBuf> {
-        self.real_file_loader.abs_path(path)
-    }
-
     fn read_file(&self, path: &Path) -> io::Result<String> {
-        if let Some(abs_path) = self.abs_path(path) {
-            if self.replacements.contains_key(&abs_path) {
-                return Ok(self.replacements[&abs_path].clone());
-            }
+        if let Some(contents) = abs_path(path).and_then(|x| self.replacements.get(&x)) {
+            return Ok(contents.clone());
         }
+
         self.real_file_loader.read_file(path)
     }
 }
 
+fn abs_path(path: &Path) -> Option<PathBuf> {
+    if path.is_absolute() {
+        Some(path.to_path_buf())
+    } else {
+        env::current_dir().ok().map(|cwd| cwd.join(path))
+    }
+}
+
 pub(super) fn current_sysroot() -> Option<String> {
     let home = env::var("RUSTUP_HOME").or_else(|_| env::var("MULTIRUST_HOME"));
     let toolchain = env::var("RUSTUP_TOOLCHAIN").or_else(|_| env::var("MULTIRUST_TOOLCHAIN"));