about summary refs log tree commit diff
path: root/src/test/compile-fail/macro-expanded-include/foo
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-16 06:34:01 -0700
committerGitHub <noreply@github.com>2016-07-16 06:34:01 -0700
commiteb196dc2fffe0c992959ed99827654c2adcebe33 (patch)
treeb409f07a1daf8e2c7aa0e0b62305354e45e7c6d5 /src/test/compile-fail/macro-expanded-include/foo
parentdc8212ff200dc54113a87b3a7033879133fdfff0 (diff)
parent11f24a93c79a5ff5ecd2c238c603bdab30926bb3 (diff)
downloadrust-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/macro-expanded-include/foo')
-rw-r--r--src/test/compile-fail/macro-expanded-include/foo/mod.rs4
1 files changed, 4 insertions, 0 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")); } }
+}