about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-04-10 13:46:17 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-04-14 10:14:19 -0700
commit9cd8a5a45bda26e632fc0dadb41a5a3b165a2840 (patch)
tree12cf43f98f4c651f21dbd6183cc6b7e269f21901
parent33fb5bb004613a0da01c2be272480c06fb82d6dc (diff)
downloadrust-9cd8a5a45bda26e632fc0dadb41a5a3b165a2840.tar.gz
rust-9cd8a5a45bda26e632fc0dadb41a5a3b165a2840.zip
std: Remove AsSlice/Str from the prelude
-rw-r--r--src/librustc_back/fs.rs2
-rw-r--r--src/libstd/prelude/v1.rs3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc_back/fs.rs b/src/librustc_back/fs.rs
index ea7f2446bf3..398e58f9e44 100644
--- a/src/librustc_back/fs.rs
+++ b/src/librustc_back/fs.rs
@@ -35,7 +35,7 @@ pub fn realpath(original: &Path) -> io::Result<PathBuf> {
         if ret == 0 {
             return Err(io::Error::last_os_error())
         }
-        assert!(ret as usize < v.capacity());
+        assert!((ret as usize) < v.capacity());
         v.set_len(ret);
     }
     Ok(PathBuf::from(OsString::from_wide(&v)))
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index 84a45086767..c93fc13284b 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -47,6 +47,3 @@
 #[doc(no_inline)] pub use string::{String, ToString};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use vec::Vec;
-
-#[allow(deprecated)] pub use slice::AsSlice;
-#[allow(deprecated)] pub use str::Str;