Skip to content

Commit 918bfa7

Browse files
committed
auto merge of #6546 : cmr/rust/warning, r=thestinger
2 parents 77c98f0 + c2baaa8 commit 918bfa7

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/libcore/rt/stack.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ pub impl StackSegment {
3131

3232
/// Point one word beyond the high end of the allocated stack
3333
fn end(&self) -> *uint {
34-
unsafe {
35-
vec::raw::to_ptr(self.buf).offset(self.buf.len()) as *uint
36-
}
34+
vec::raw::to_ptr(self.buf).offset(self.buf.len()) as *uint
3735
}
3836
}
3937

src/libcore/rt/uv/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ pub type Buf = uvll::uv_buf_t;
362362
363363
/// Borrow a slice to a Buf
364364
pub fn slice_to_uv_buf(v: &[u8]) -> Buf {
365-
let data = unsafe { vec::raw::to_ptr(v) };
365+
let data = vec::raw::to_ptr(v);
366366
unsafe { uvll::buf_init(data, v.len()) }
367367
}
368368

src/librustc/util/enum_set.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#[cfg(stage0)]
1112
use core;
1213

1314
#[deriving(Eq, IterBytes)]

0 commit comments

Comments
 (0)