mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save-analysis: use absolute paths for file names

Browse Source
This commit is contained in:
Nick Cameron 2015-11-26 18:05:32 +13:00
parent 498f08d369
commit befa29e0dc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_trans/save/recorder.rs
View File

@ -665,7 +665,7 @@ impl<'a, 'tcx: 'a> FmtStrs<'a, 'tcx> {
pub fn external_crate_str(&mut self, span: Span, name: &str, num: ast::CrateNum) {
let lo_loc = self.span.sess.codemap().lookup_char_pos(span.lo);
self.record_without_span(ExternalCrate,
svec!(name, num, lo_loc.file.name),
svec!(name, num, SpanUtils::make_path_string(&lo_loc.file.name)),
span);
}

13
src/librustc_trans/save/span_utils.rs
View File

@ -13,6 +13,8 @@ use rustc::session::Session;
use save::generated_code;
use std::cell::Cell;
use std::env;
use std::path::Path;
use syntax::ast;
use syntax::codemap::*;
@ -35,6 +37,15 @@ impl<'a> SpanUtils<'a> {
}
}
pub fn make_path_string(file_name: &str) -> String {
let path = Path::new(file_name);
if path.is_absolute() {
path.clone().display().to_string()
} else {
env::current_dir().unwrap().join(&path).display().to_string()
}
}
// Standard string for extents/location.
#[rustfmt_skip]
pub fn extent_str(&self, span: Span) -> String {
@ -47,7 +58,7 @@ impl<'a> SpanUtils<'a> {
format!("file_name,\"{}\",file_line,{},file_col,{},extent_start,{},extent_start_bytes,{},\
file_line_end,{},file_col_end,{},extent_end,{},extent_end_bytes,{}",
lo_loc.file.name,
SpanUtils::make_path_string(&lo_loc.file.name),
lo_loc.line, lo_loc.col.to_usize(), lo_pos.to_usize(), lo_pos_byte.to_usize(),
hi_loc.line, hi_loc.col.to_usize(), hi_pos.to_usize(), hi_pos_byte.to_usize())
}