From d18897cadfe243591bac2c606d63ce37449d5257 Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Mon, 2 Mar 2015 23:56:13 +0100 Subject: [PATCH] Revert incorrect `usize` -> `u32` replacements from #22510 Conflicts: src/libstd/thread.rs --- src/libstd/thread.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 0f0bca5e8b2..e8330820906 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -277,7 +277,7 @@ fn spawn_inner(self, f: Thunk<(), T>) -> io::Result> { // address at which our stack started). let main = move || { let something_around_the_top_of_the_stack = 1; - let addr = &something_around_the_top_of_the_stack as *const isize; + let addr = &something_around_the_top_of_the_stack as *const i32; let my_stack_top = addr as usize; let my_stack_bottom = my_stack_top - stack_size + 1024; unsafe { @@ -802,13 +802,13 @@ fn test_spawn_sched_childs_on_default_sched() { } fn avoid_copying_the_body(spawnfn: F) where F: FnOnce(Thunk<'static>) { - let (tx, rx) = channel::(); + let (tx, rx) = channel(); let x = box 1; - let x_in_parent = (&*x) as *const isize as u32; + let x_in_parent = (&*x) as *const i32 as usize; spawnfn(Thunk::new(move|| { - let x_in_child = (&*x) as *const isize as u32; + let x_in_child = (&*x) as *const i32 as usize; tx.send(x_in_child).unwrap(); })); @@ -847,8 +847,8 @@ fn test_child_doesnt_ref_parent() { // climbing the task tree to dereference each ancestor. (See #1789) // (well, it would if the constant were 8000+ - I lowered it to be more // valgrind-friendly. try this at home, instead..!) - const GENERATIONS: usize = 16; - fn child_no(x: usize) -> Thunk<'static> { + const GENERATIONS: u32 = 16; + fn child_no(x: u32) -> Thunk<'static> { return Thunk::new(move|| { if x < GENERATIONS { thread::spawn(move|| child_no(x+1).invoke(())); -- 2.44.0