Skip to content

Commit 023e729

Browse files
committed
libstd: Fix Win32 bustage.
1 parent dc00ff2 commit 023e729

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

src/libstd/gc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ mod tests {
6161
fn test_clone() {
6262
let x = Gc::new(Cell::new(5));
6363
let y = x.clone();
64-
do x.borrow().with_mut_ref |inner| {
64+
x.borrow().with_mut_ref(|inner| {
6565
*inner = 20;
66-
}
66+
});
6767
assert_eq!(y.borrow().take(), 20);
6868
}
6969

7070
#[test]
7171
fn test_deep_clone() {
7272
let x = Gc::new(Cell::new(5));
7373
let y = x.deep_clone();
74-
do x.borrow().with_mut_ref |inner| {
74+
x.borrow().with_mut_ref(|inner| {
7575
*inner = 20;
76-
}
76+
});
7777
assert_eq!(y.borrow().take(), 5);
7878
}
7979

src/libstd/io/native/file.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,9 @@ pub fn unlink(p: &CString) -> IoResult<()> {
576576
#[cfg(windows)]
577577
fn os_unlink(p: &CString) -> IoResult<()> {
578578
super::mkerr_winbool(unsafe {
579-
as_utf16_p(p.as_str().unwrap(), |buf| libc::DeleteFileW(buf));
579+
as_utf16_p(p.as_str().unwrap(), |buf| {
580+
libc::DeleteFileW(buf);
581+
});
580582
})
581583
}
582584

src/libstd/io/native/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ fn with_envp<T>(env: Option<~[(~str, ~str)]>, cb: |*mut c_void| -> T) -> T {
500500

501501
blk.push(0);
502502

503-
blk.as_imm_buf(|p, _len| unsafe { cb(cast::transmute(p)) });
503+
blk.as_imm_buf(|p, _len| unsafe { cb(cast::transmute(p)) })
504504
}
505505
_ => cb(ptr::mut_null())
506506
}

src/libstd/vec.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3889,68 +3889,68 @@ mod bench {
38893889
#[bench]
38903890
fn push(bh: &mut BenchHarness) {
38913891
let mut vec: ~[uint] = ~[0u];
3892-
do bh.iter() {
3892+
bh.iter(|| {
38933893
vec.push(0);
3894-
}
3894+
})
38953895
}
38963896

38973897
#[bench]
38983898
fn starts_with_same_vector(bh: &mut BenchHarness) {
38993899
let vec: ~[uint] = vec::from_fn(100, |i| i);
3900-
do bh.iter() {
3900+
bh.iter(|| {
39013901
vec.starts_with(vec);
3902-
}
3902+
})
39033903
}
39043904

39053905
#[bench]
39063906
fn starts_with_single_element(bh: &mut BenchHarness) {
39073907
let vec: ~[uint] = ~[0u];
3908-
do bh.iter() {
3908+
bh.iter(|| {
39093909
vec.starts_with(vec);
3910-
}
3910+
})
39113911
}
39123912

39133913
#[bench]
39143914
fn starts_with_diff_one_element_at_end(bh: &mut BenchHarness) {
39153915
let vec: ~[uint] = vec::from_fn(100, |i| i);
39163916
let mut match_vec: ~[uint] = vec::from_fn(99, |i| i);
39173917
match_vec.push(0);
3918-
do bh.iter() {
3918+
bh.iter(|| {
39193919
vec.starts_with(match_vec);
3920-
}
3920+
})
39213921
}
39223922

39233923
#[bench]
39243924
fn ends_with_same_vector(bh: &mut BenchHarness) {
39253925
let vec: ~[uint] = vec::from_fn(100, |i| i);
3926-
do bh.iter() {
3926+
bh.iter(|| {
39273927
vec.ends_with(vec);
3928-
}
3928+
})
39293929
}
39303930

39313931
#[bench]
39323932
fn ends_with_single_element(bh: &mut BenchHarness) {
39333933
let vec: ~[uint] = ~[0u];
3934-
do bh.iter() {
3934+
bh.iter(|| {
39353935
vec.ends_with(vec);
3936-
}
3936+
})
39373937
}
39383938

39393939
#[bench]
39403940
fn ends_with_diff_one_element_at_beginning(bh: &mut BenchHarness) {
39413941
let vec: ~[uint] = vec::from_fn(100, |i| i);
39423942
let mut match_vec: ~[uint] = vec::from_fn(100, |i| i);
39433943
match_vec[0] = 200;
3944-
do bh.iter() {
3944+
bh.iter(|| {
39453945
vec.starts_with(match_vec);
3946-
}
3946+
})
39473947
}
39483948

39493949
#[bench]
39503950
fn contains_last_element(bh: &mut BenchHarness) {
39513951
let vec: ~[uint] = vec::from_fn(100, |i| i);
3952-
do bh.iter() {
3952+
bh.iter(|| {
39533953
vec.contains(&99u);
3954-
}
3954+
})
39553955
}
39563956
}

0 commit comments

Comments
 (0)