Skip to content

Commit e222109

Browse files
committed
---
yaml --- r: 49121 b: refs/heads/snap-stage3 c: b1c0a66 h: refs/heads/master i: 49119: 8792f9e v: v3
1 parent 6bd5f0d commit e222109

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 3dbf2c3c5c2032ad87e6975abdf854d780839d2d
4+
refs/heads/snap-stage3: b1c0a6628beb612f3d847ab088e74da639f6ca7b
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/stackwalk.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn breakpoint() {
8080
}
8181
}
8282

83-
fn frame_address(f: &fn(++x: *u8)) {
83+
fn frame_address(f: &fn(x: *u8)) {
8484
unsafe {
8585
rusti::frame_address(f)
8686
}
@@ -95,7 +95,7 @@ pub mod rustrt {
9595
pub mod rusti {
9696
#[abi = "rust-intrinsic"]
9797
pub extern {
98-
pub fn frame_address(f: &once fn(++x: *u8));
98+
pub fn frame_address(f: &once fn(x: *u8));
9999
}
100100
}
101101

branches/snap-stage3/src/libstd/ebml.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ pub mod reader {
6161

6262
use core::int;
6363
use core::io;
64-
use core::ops;
6564
use core::prelude::*;
6665
use core::str;
6766
use core::vec;

branches/snap-stage3/src/libstd/net_tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ impl ToTcpErr for uv::ll::uv_err_data {
12811281

12821282
extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
12831283
nread: libc::ssize_t,
1284-
++buf: uv::ll::uv_buf_t) {
1284+
buf: uv::ll::uv_buf_t) {
12851285
unsafe {
12861286
debug!("entering on_tcp_read_cb stream: %? nread: %?",
12871287
stream, nread);

0 commit comments

Comments
 (0)