auto merge of #6913 : thestinger/rust/ptr, r=graydon

Closes #6607

I went with `RawPtr` instead of `UnsafePtr` because not all of these operations are `unsafe`, so to me it makes more sense to refer to it as a "raw" (not wrapped/abstracted) pointer. If we decide on something else in #6608 it can be renamed again.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 2fac1df01a4..f6017b92807 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -56,7 +56,7 @@ Several modules in `core` are clients of `rt`:
 
 #[doc(hidden)];
 
-use ptr::Ptr;
+use ptr::RawPtr;
 
 /// The global (exchange) heap.
 pub mod global_heap;
diff --git a/src/libstd/rt/stack.rs b/src/libstd/rt/stack.rs
index fa4b8f30f4e..b0e87a62c8b 100644
--- a/src/libstd/rt/stack.rs
+++ b/src/libstd/rt/stack.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use container::Container;
-use ptr::Ptr;
+use ptr::RawPtr;
 use vec;
 use ops::Drop;
 use libc::{c_uint, uintptr_t};
diff --git a/src/libstd/rt/uv/mod.rs b/src/libstd/rt/uv/mod.rs
index bc968fc3d60..84d1e65454f 100644
--- a/src/libstd/rt/uv/mod.rs
+++ b/src/libstd/rt/uv/mod.rs
@@ -38,7 +38,7 @@ use container::Container;
 use option::*;
 use str::raw::from_c_str;
 use to_str::ToStr;
-use ptr::Ptr;
+use ptr::RawPtr;
 use libc;
 use vec;
 use ptr;