languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #5595 : catamorphism/rust/demoding, r=catamorphism

Browse source
This commit is contained in:
bors 2013-03-28 04:54:45 -07:00
parent 3dbf2c3c5c b0d1643fa6
commit b1c0a6628b
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libcore/stackwalk.rs
View file

@ -80,7 +80,7 @@ fn breakpoint() {
} }
} }
fn frame_address(f: &fn(++x: *u8)) { fn frame_address(f: &fn(x: *u8)) {
unsafe { unsafe {
rusti::frame_address(f) rusti::frame_address(f)
} }
@ -95,7 +95,7 @@ pub mod rustrt {
pub mod rusti { pub mod rusti {
#[abi = "rust-intrinsic"] #[abi = "rust-intrinsic"]
pub extern { pub extern {
pub fn frame_address(f: &once fn(++x: *u8)); pub fn frame_address(f: &once fn(x: *u8));
} }
} }

1
src/libstd/ebml.rs
View file

@ -61,7 +61,6 @@ pub mod reader {
use core::int; use core::int;
use core::io; use core::io;
use core::ops;
use core::prelude::*; use core::prelude::*;
use core::str; use core::str;
use core::vec; use core::vec;

2
src/libstd/net_tcp.rs
View file

@ -1281,7 +1281,7 @@ fn to_tcp_err(&self) -> TcpErrData {
extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t, extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
nread: libc::ssize_t, nread: libc::ssize_t,
++buf: uv::ll::uv_buf_t) { buf: uv::ll::uv_buf_t) {
unsafe { unsafe {
debug!("entering on_tcp_read_cb stream: %? nread: %?", debug!("entering on_tcp_read_cb stream: %? nread: %?",
stream, nread); stream, nread);