diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-06-24 11:43:59 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-06-24 11:43:59 +0000 |
| commit | fd12c346018e63702afeccd4a96eae99dcdb3afa (patch) | |
| tree | 6006d09101c7af7011d5f917d06124a96f650f61 /src/libsyntax/ext/source_util.rs | |
| parent | ad7fe6521b8a59d84102113ad660edb21de2cba6 (diff) | |
| download | rust-fd12c346018e63702afeccd4a96eae99dcdb3afa.tar.gz rust-fd12c346018e63702afeccd4a96eae99dcdb3afa.zip | |
Revert a change to the relative path for macro-expanded `include!`s
Diffstat (limited to 'src/libsyntax/ext/source_util.rs')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index fd229d77966..d297188a35c 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -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 { // NB: relative paths are resolved relative to the compilation unit 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.push(arg); cu |