about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-04 16:48:29 -0700
committerbors <bors@rust-lang.org>2016-06-04 16:48:29 -0700
commitccfaaa7d989356ff440e9960da28909491e2f00d (patch)
treeafa20a81f424a4cdf1e70086e7a83ec3fa7a050f /src/test
parent12238b984abfacb2cccea176f862c94aa1231fb5 (diff)
parent9639ec87e7c64548b6a7cb800562ec1cf1094c04 (diff)
downloadrust-ccfaaa7d989356ff440e9960da28909491e2f00d.tar.gz
rust-ccfaaa7d989356ff440e9960da28909491e2f00d.zip
Auto merge of #34031 - jseyfried:fix_cfg_bug, r=eddyb
Fix a regression in the configuration folder

This fixes #34028, a regression caused by #33706 in which unconfigured impl items generated by a macro in an impl item position are not removed.
r? @nrc
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/issue-34028.rs21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/test/compile-fail/issue-34028.rs b/src/test/compile-fail/issue-34028.rs
new file mode 100644
index 00000000000..117ab18a115
--- /dev/null
+++ b/src/test/compile-fail/issue-34028.rs
@@ -0,0 +1,21 @@
+// 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+
+macro_rules! m {
+    () => { #[cfg(any())] fn f() {} }
+}
+
+trait T {}
+impl T for () { m!(); }
+
+#[rustc_error]
+fn main() {} //~ ERROR compilation successful