Auto merge of #34816 - jseyfried:fix_include_path, r=nrc

Fix `include!()`s inside `asm!()` invocations

Fixes #34812, a regression caused by #33749 that was not fixed in #34450.
r? @nrc
This commit is contained in:
bors 2016-07-16 06:34:01 -07:00 committed by GitHub
commit eb196dc2ff
3 changed files with 13 additions and 1 deletions

View file

@ -13,3 +13,7 @@
macro_rules! m {
() => { include!("file.txt"); }
}
macro_rules! n {
() => { unsafe { asm!(include_str!("file.txt")); } }
}

View file

@ -8,12 +8,14 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(rustc_attrs)]
#![feature(asm, rustc_attrs)]
#![allow(unused)]
#[macro_use]
mod foo;
m!();
fn f() { n!(); }
#[rustc_error]
fn main() {} //~ ERROR compilation successful