From fd12c346018e63702afeccd4a96eae99dcdb3afa Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Fri, 24 Jun 2016 11:43:59 +0000 Subject: [PATCH 1/2] Revert a change to the relative path for macro-expanded `include!`s --- src/libsyntax/ext/source_util.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index fd229d77966b7..d297188a35c8c 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 From e4885565a57be071327669125079465c6f1b5305 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Fri, 24 Jun 2016 11:46:18 +0000 Subject: [PATCH 2/2] Add regression test --- .../macro-expanded-include/file.txt | 0 .../macro-expanded-include/foo/mod.rs | 15 +++++++++++++++ .../macro-expanded-include/test.rs | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/test/compile-fail/macro-expanded-include/file.txt create mode 100644 src/test/compile-fail/macro-expanded-include/foo/mod.rs create mode 100644 src/test/compile-fail/macro-expanded-include/test.rs diff --git a/src/test/compile-fail/macro-expanded-include/file.txt b/src/test/compile-fail/macro-expanded-include/file.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/src/test/compile-fail/macro-expanded-include/foo/mod.rs b/src/test/compile-fail/macro-expanded-include/foo/mod.rs new file mode 100644 index 0000000000000..57b7b72a1d435 --- /dev/null +++ b/src/test/compile-fail/macro-expanded-include/foo/mod.rs @@ -0,0 +1,15 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ignore-test + +macro_rules! m { + () => { include!("file.txt"); } +} diff --git a/src/test/compile-fail/macro-expanded-include/test.rs b/src/test/compile-fail/macro-expanded-include/test.rs new file mode 100644 index 0000000000000..7ab9dd19b1b70 --- /dev/null +++ b/src/test/compile-fail/macro-expanded-include/test.rs @@ -0,0 +1,19 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(rustc_attrs)] + +#[macro_use] +mod foo; + +m!(); + +#[rustc_error] +fn main() {} //~ ERROR compilation successful