about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-16 21:19:38 -0700
committerbors <bors@rust-lang.org>2013-05-16 21:19:38 -0700
commit918bfa710c2079ed1a690036eb794694b75faa30 (patch)
tree506603f5c4114e49d4951869d5423215149e8812
parent77c98f081509733af957af6ed7b0b277e5f57871 (diff)
parentc2baaa8d8432c8d7320e928e7ad706f225430bb3 (diff)
downloadrust-918bfa710c2079ed1a690036eb794694b75faa30.tar.gz
rust-918bfa710c2079ed1a690036eb794694b75faa30.zip
auto merge of #6546 : cmr/rust/warning, r=thestinger
-rw-r--r--src/libcore/rt/stack.rs4
-rw-r--r--src/libcore/rt/uv/mod.rs2
-rw-r--r--src/librustc/util/enum_set.rs1
3 files changed, 3 insertions, 4 deletions
diff --git a/src/libcore/rt/stack.rs b/src/libcore/rt/stack.rs
index 3a4e9307d3b..061d7dab9a1 100644
--- a/src/libcore/rt/stack.rs
+++ b/src/libcore/rt/stack.rs
@@ -31,9 +31,7 @@ pub impl StackSegment {
 
     /// Point one word beyond the high end of the allocated stack
     fn end(&self) -> *uint {
-        unsafe {
-            vec::raw::to_ptr(self.buf).offset(self.buf.len()) as *uint
-        }
+        vec::raw::to_ptr(self.buf).offset(self.buf.len()) as *uint
     }
 }
 
diff --git a/src/libcore/rt/uv/mod.rs b/src/libcore/rt/uv/mod.rs
index 6499f0a3efd..1d93b327395 100644
--- a/src/libcore/rt/uv/mod.rs
+++ b/src/libcore/rt/uv/mod.rs
@@ -362,7 +362,7 @@ pub type Buf = uvll::uv_buf_t;
 
 /// Borrow a slice to a Buf
 pub fn slice_to_uv_buf(v: &[u8]) -> Buf {
-    let data = unsafe { vec::raw::to_ptr(v) };
+    let data = vec::raw::to_ptr(v);
     unsafe { uvll::buf_init(data, v.len()) }
 }
 
diff --git a/src/librustc/util/enum_set.rs b/src/librustc/util/enum_set.rs
index 801561350ae..2e6c4ee3eaa 100644
--- a/src/librustc/util/enum_set.rs
+++ b/src/librustc/util/enum_set.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[cfg(stage0)]
 use core;
 
 #[deriving(Eq, IterBytes)]