Skip to content

Commit d82d987

Browse files
committed
auto merge of #6232 : pcwalton/rust/demuting, r=pcwalton
They're still parsed for bootstrapping purposes, but the qualifier is immediately dropped on the floor. r? @nikomatsakis
2 parents 5a65f51 + d20e63a commit d82d987

File tree

164 files changed

+1596
-1338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+1596
-1338
lines changed

src/libcore/at_vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ pub mod rustrt {
2929
#[abi = "cdecl"]
3030
#[link_name = "rustrt"]
3131
pub extern {
32-
pub unsafe fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
33-
++v: **vec::raw::VecRepr,
34-
++n: libc::size_t);
32+
pub unsafe fn vec_reserve_shared_actual(t: *sys::TypeDesc,
33+
v: **vec::raw::VecRepr,
34+
n: libc::size_t);
3535
}
3636
}
3737

@@ -60,7 +60,7 @@ pub fn capacity<T>(v: @[T]) -> uint {
6060
pub fn build_sized<A>(size: uint, builder: &fn(push: &fn(v: A))) -> @[A] {
6161
let mut vec: @[A] = @[];
6262
unsafe { raw::reserve(&mut vec, size); }
63-
builder(|+x| unsafe { raw::push(&mut vec, x) });
63+
builder(|x| unsafe { raw::push(&mut vec, x) });
6464
return unsafe { transmute(vec) };
6565
}
6666

src/libcore/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub mod rusti {
1717
#[abi = "rust-intrinsic"]
1818
#[link_name = "rusti"]
1919
pub extern "rust-intrinsic" {
20-
fn forget<T>(+x: T);
20+
fn forget<T>(x: T);
2121

2222
fn transmute<T,U>(e: T) -> U;
2323
}

0 commit comments

Comments
 (0)