rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert a change to the relative path for macro-expanded include!s

Browse Source
This commit is contained in:
Jeffrey Seyfried
2016-06-24 11:43:59 +00:00
parent ad7fe6521b
commit fd12c34601
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,8 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
fn res_rel_file(cx: &mut ExtCtxt, sp: codemap::Span, arg: &Path) -> PathBuf { fn res_rel_file(cx: &mut ExtCtxt, sp: codemap::Span, arg: &Path) -> PathBuf {
// NB: relative paths are resolved relative to the compilation unit // NB: relative paths are resolved relative to the compilation unit
if !arg.is_absolute() { if !arg.is_absolute() {
let mut cu = PathBuf::from(&cx.codemap().span_to_filename(sp)); let callsite = cx.codemap().source_callsite(sp);
let mut cu = PathBuf::from(&cx.codemap().span_to_filename(callsite));
cu.pop(); cu.pop();
cu.push(arg); cu.push(arg);
cu cu