user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for --remap-path-prefix in save-analysis

Browse source
This commit is contained in:
Igor Matuszewski 2018-08-06 14:07:08 +02:00
parent 7c98d2e63f
commit e8bb7bf35a
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_save_analysis/lib.rs
View file

@ -125,7 +125,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
result.push(ExternalCrateData {
// FIXME: change file_name field to PathBuf in rls-data
// https://github.com/nrc/rls-data/issues/7
file_name: SpanUtils::make_path_string(&lo_loc.file.name),
file_name: self.span_utils.make_path_string(&lo_loc.file.name),
num: n.as_u32(),
id: GlobalCrateId {
name: self.tcx.crate_name(n).to_string(),

6
src/librustc_save_analysis/span_utils.rs
View file

@ -13,7 +13,6 @@ use rustc::session::Session;
use generated_code;
use std::cell::Cell;
use std::env;
use syntax::parse::lexer::{self, StringReader};
use syntax::parse::token::{self, Token};
@ -36,11 +35,10 @@ impl<'a> SpanUtils<'a> {
}
}
pub fn make_path_string(path: &FileName) -> String {
pub fn make_path_string(&self, path: &FileName) -> String {
match *path {
FileName::Real(ref path) if !path.is_absolute() =>
env::current_dir()
.unwrap()
self.sess.working_dir.0
.join(&path)
.display()
.to_string(),