Skip to content

Commit f9beffe

Browse files
committed
---
yaml --- r: 50330 b: refs/heads/auto c: b1c0a66 h: refs/heads/master v: v3
1 parent 4fb234b commit f9beffe

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
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 3dbf2c3c5c2032ad87e6975abdf854d780839d2d
17+
refs/heads/auto: b1c0a6628beb612f3d847ab088e74da639f6ca7b
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

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