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

Some tidying up around include!

Browse Source
This commit is contained in:
Nick Cameron 2017-08-01 14:30:46 +12:00
parent ba1d065ffa
commit 177cbe01be
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/ext/source_util.rs
View File

@ -183,13 +183,14 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[tokenstream::Toke
// resolve a file-system path to an absolute file-system path (if it // resolve a file-system path to an absolute file-system path (if it
// isn't already) // isn't already)
fn res_rel_file(cx: &mut ExtCtxt, sp: syntax_pos::Span, arg: &Path) -> PathBuf { fn res_rel_file(cx: &mut ExtCtxt, sp: syntax_pos::Span, arg: &Path) -> PathBuf {
// NB: relative paths are resolved relative to the compilation unit // Relative paths are resolved relative to the file in which they are found
// after macro expansion (that is, they are unhygienic).
if !arg.is_absolute() { if !arg.is_absolute() {
let callsite = sp.source_callsite(); let callsite = sp.source_callsite();
let mut cu = PathBuf::from(&cx.codemap().span_to_filename(callsite)); let mut path = PathBuf::from(&cx.codemap().span_to_filename(callsite));
cu.pop(); path.pop();
cu.push(arg); path.push(arg);
cu path
} else { } else {
arg.to_path_buf() arg.to_path_buf()
} }