about summary refs log tree commit diff
path: root/src/test/pretty
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-17 19:00:20 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-17 19:42:28 -0800
commit665ea963d3c29ef7670662707f2f2307f000efa3 (patch)
tree9281d6d03436f1c92585c191a7a130d38e1ff9f0 /src/test/pretty
parentba8ce4c2c27643cccfbbc481a19bcf4b7747cc89 (diff)
downloadrust-665ea963d3c29ef7670662707f2f2307f000efa3.tar.gz
rust-665ea963d3c29ef7670662707f2f2307f000efa3.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/test/pretty')
-rw-r--r--src/test/pretty/attr-fn-inner.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/pretty/attr-fn-inner.rs b/src/test/pretty/attr-fn-inner.rs
index 65dcf900567..79964d2a7ba 100644
--- a/src/test/pretty/attr-fn-inner.rs
+++ b/src/test/pretty/attr-fn-inner.rs
@@ -13,6 +13,8 @@
 // preserved, and that the first outer item parsed in main is not
 // accidentally carried over to each inner function
 
+#![feature(custom_attribute)]
+
 fn main() {
     #![inner_attr]
     #[outer_attr]