about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-25 05:26:36 -0800
committerbors <bors@rust-lang.org>2014-02-25 05:26:36 -0800
commitd222f03f42fe855d2fadc87010453bcfc2a669e1 (patch)
tree0e7dfbf0d0577a97d5c00822eb5c913693ea4f10 /src/libstd
parent27cc309a7f1cc89c35388eda48041d9880b4737c (diff)
parent3e531ed0edd44c5af714fdeaa0cddb9d5c8154a2 (diff)
downloadrust-d222f03f42fe855d2fadc87010453bcfc2a669e1.tar.gz
rust-d222f03f42fe855d2fadc87010453bcfc2a669e1.zip
auto merge of #12525 : eddyb/rust/gate-default-type-param-usage, r=alexcrichton
Also reverted `#[deriving(Hash)]` to implement `Hash` only for `SipState`, until we decide what to do about default type params.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index d7fc85bc259..e96eedea5cb 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -56,6 +56,8 @@
 
 // Turn on default type parameters.
 #[feature(default_type_params)];
+// NOTE remove the following two attributes after the next snapshot.
+#[allow(unrecognized_lint)];
 #[allow(default_type_param_usage)];
 
 // Don't link to std. We are std.