impl<T> *const T, impl<T> *mut T

7 files changed, 9 insertions, 0 deletions

diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index 69fd0a57d5f..7812363d55e 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -24,7 +24,10 @@ use num::wrapping::{OverflowingOps, WrappingOps};
 use ops::{Deref, DerefMut, Drop};
 use option::Option;
 use option::Option::{Some, None};
+#[cfg(stage0)]
 use ptr::{self, PtrExt, Unique};
+#[cfg(not(stage0))]
+use ptr::{self, Unique};
 use rt::heap::{allocate, deallocate, EMPTY};
 use collections::hash_state::HashState;
 
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index c89edf72842..72d014e77a7 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -20,6 +20,7 @@ use iter::Iterator;
 use marker::Sized;
 use ops::{Drop, FnOnce};
 use option::Option::{self, Some, None};
+#[cfg(stage0)]
 use ptr::PtrExt;
 use result::Result::{Ok, Err};
 use result;
diff --git a/src/libstd/old_io/extensions.rs b/src/libstd/old_io/extensions.rs
index b67ec847c79..a81275952c5 100644
--- a/src/libstd/old_io/extensions.rs
+++ b/src/libstd/old_io/extensions.rs
@@ -26,6 +26,7 @@ use num::Int;
 use ops::FnOnce;
 use option::Option;
 use option::Option::{Some, None};
+#[cfg(stage0)]
 use ptr::PtrExt;
 use result::Result::{Ok, Err};
 #[cfg(stage0)]
diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs
index 89e813de5b6..2c978177c50 100644
--- a/src/libstd/old_io/mod.rs
+++ b/src/libstd/old_io/mod.rs
@@ -935,6 +935,7 @@ impl<'a> Reader for &'a mut (Reader+'a) {
 // API yet. If so, it should be a method on Vec.
 unsafe fn slice_vec_capacity<'a, T>(v: &'a mut Vec<T>, start: uint, end: uint) -> &'a mut [T] {
     use slice;
+    #[cfg(stage0)]
     use ptr::PtrExt;
 
     assert!(start <= end);
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index e04d7f3f240..fc05eb1d627 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -52,6 +52,7 @@ use option::Option::{Some, None};
 use option::Option;
 use old_path::{Path, GenericPath, BytesContainer};
 use path::{self, PathBuf};
+#[cfg(stage0)]
 use ptr::PtrExt;
 use ptr;
 use result::Result::{Err, Ok};
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index e21ae1657ee..4327b26260a 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -40,6 +40,7 @@
 #[doc(no_inline)] pub use iter::{Iterator, IteratorExt, Extend};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use option::Option::{self, Some, None};
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use ptr::{PtrExt, MutPtrExt};
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libstd/rt/at_exit_imp.rs b/src/libstd/rt/at_exit_imp.rs
index 08755ba829f..f6bb87f011d 100644
--- a/src/libstd/rt/at_exit_imp.rs
+++ b/src/libstd/rt/at_exit_imp.rs
@@ -12,6 +12,7 @@
 //!
 //! Documentation can be found on the `rt::at_exit` function.
 
+#[cfg(stage0)]
 use core::prelude::*;
 
 use boxed;