Skip to content

Commit 6c7ac8d

Browse files
committed
---
yaml --- r: 59269 b: refs/heads/incoming c: 918bfa7 h: refs/heads/master i: 59267: 2edb244 v: v3
1 parent 0092b12 commit 6c7ac8d

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 77c98f081509733af957af6ed7b0b277e5f57871
9+
refs/heads/incoming: 918bfa710c2079ed1a690036eb794694b75faa30
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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

branches/incoming/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

branches/incoming/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)