Skip to content

Commit 36c481a

Browse files
committed
---
yaml --- r: 139397 b: refs/heads/try2 c: b0d1643 h: refs/heads/master i: 139395: c058f47 v: v3
1 parent 7261bde commit 36c481a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 31f8093037400afb7fad694aabcc0b620c14b8f2
8+
refs/heads/try2: b0d1643fa6de6526368f9ebae62c29fb4680e574
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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