diff options
| author | bors <bors@rust-lang.org> | 2016-07-16 06:34:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 06:34:01 -0700 |
| commit | eb196dc2fffe0c992959ed99827654c2adcebe33 (patch) | |
| tree | b409f07a1daf8e2c7aa0e0b62305354e45e7c6d5 /src/test/compile-fail | |
| parent | dc8212ff200dc54113a87b3a7033879133fdfff0 (diff) | |
| parent | 11f24a93c79a5ff5ecd2c238c603bdab30926bb3 (diff) | |
| download | rust-eb196dc2fffe0c992959ed99827654c2adcebe33.tar.gz rust-eb196dc2fffe0c992959ed99827654c2adcebe33.zip | |
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
Diffstat (limited to 'src/test/compile-fail')
| -rw-r--r-- | src/test/compile-fail/macro-expanded-include/foo/mod.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/macro-expanded-include/test.rs | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/test/compile-fail/macro-expanded-include/foo/mod.rs b/src/test/compile-fail/macro-expanded-include/foo/mod.rs index 57b7b72a1d4..888bdf5179a 100644 --- a/src/test/compile-fail/macro-expanded-include/foo/mod.rs +++ b/src/test/compile-fail/macro-expanded-include/foo/mod.rs @@ -13,3 +13,7 @@ macro_rules! m { () => { include!("file.txt"); } } + +macro_rules! n { + () => { unsafe { asm!(include_str!("file.txt")); } } +} diff --git a/src/test/compile-fail/macro-expanded-include/test.rs b/src/test/compile-fail/macro-expanded-include/test.rs index 7ab9dd19b1b..e1e85ddb2c1 100644 --- a/src/test/compile-fail/macro-expanded-include/test.rs +++ b/src/test/compile-fail/macro-expanded-include/test.rs @@ -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 |