Update to rust master

andersk · Apr 1, 2015 · 8184105 · 8184105
1 parent 3f2d048
commit 8184105
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/json.rs b/src/json.rs
@@ -2545,7 +2545,6 @@ mod tests {
                 StackElement, Stack, Decoder, Encoder, EncoderError};
     use std::{i64, u64, f32, f64};
     use std::collections::BTreeMap;
-    use std::num::Float;
     use std::string;
 
     #[derive(RustcDecodable, Eq, PartialEq, Debug)]

diff --git a/src/lib.rs b/src/lib.rs
@@ -14,7 +14,7 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/rustc-serialize/")]
 #![cfg_attr(test, deny(warnings))]
-#![cfg_attr(test, feature(test, std_misc))]
+#![cfg_attr(test, feature(test))]
 #![allow(trivial_numeric_casts)]
 
 #[cfg(test)] extern crate test;