about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorTobias Bucher <tobiasbucher5991@gmail.com>2015-07-24 21:02:05 +0200
committerTobias Bucher <tobiasbucher5991@gmail.com>2015-08-09 22:05:22 +0200
commit47041fe28920326807b29c1246ca9712e184f885 (patch)
tree8a7de25f7da03695a5003eb49adf52f64b9f3de0 /src/libstd
parent22ec5f4af7b5a85ad375d672ed727571b49f3cad (diff)
downloadrust-47041fe28920326807b29c1246ca9712e184f885.tar.gz
rust-47041fe28920326807b29c1246ca9712e184f885.zip
Make `slice::transmute*` private
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ffi/c_str.rs2
-rw-r--r--src/libstd/lib.rs1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index adbda6ae242..3e503074ab4 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -395,7 +395,7 @@ impl CStr {
     /// > length calculation whenever this method is called.
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn to_bytes_with_nul(&self) -> &[u8] {
-        unsafe { slice::transmute(&self.inner) }
+        unsafe { mem::transmute(&self.inner) }
     }
 
     /// Yields a `&str` slice if the `CStr` contains valid UTF-8.
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 65f195be4e8..b4bbb3f25f7 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -234,7 +234,6 @@
 #![feature(reflect_marker)]
 #![feature(slice_bytes)]
 #![feature(slice_patterns)]
-#![feature(slice_transmute)]
 #![feature(staged_api)]
 #![feature(str_as_bytes_mut)]
 #![feature(str_char)]