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(),
use generated_code;
use std::cell::Cell;
-use std::env;
use syntax::parse::lexer::{self, StringReader};
use syntax::parse::token::{self, Token};
}
}
- 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(),