about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-11-28 18:03:38 -0800
committerAlex Crichton <alex@alexcrichton.com>2013-11-30 14:34:59 -0800
commit56e4c82a38cfb2bcf7de2d6323dab0073a70726d (patch)
treed8543567d747168ecd9bf9817477cdbf0c187333 /src/libstd
parentc1e287af7788261bd50f47a166fbbd3493355a38 (diff)
downloadrust-56e4c82a38cfb2bcf7de2d6323dab0073a70726d.tar.gz
rust-56e4c82a38cfb2bcf7de2d6323dab0073a70726d.zip
Test fixes and merge conflicts
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 0489fff31f9..296091d26e6 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -66,6 +66,7 @@
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
+#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print
 // things and all of the std::io tests have an I/O interface to run on top