---

yaml
---
r: 77821
b: refs/heads/master
c: a2ffcea
h: refs/heads/master
i:
  77819: bb503fe
v: v3

Author: bouk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 72bf8956298107d36430bbfc4a18177e7b2097c6
+refs/heads/master: a2ffceaedd5d80a83bafd3e930541c1d32424604
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
 refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a

trunk/src/libextra/test.rs

@@ -745,7 +745,7 @@ fn get_concurrency() -> uint {
             let opt_n: Option<uint> = FromStr::from_str(s);
             match opt_n {
                 Some(n) if n > 0 => n,
-                _ => fail!("RUST_TEST_TASKS is `%s`, should be a positive integer.", s)
+                _ => fail!("RUST_TEST_TASKS is `%s`, should be a non-negative integer.", s)
             }
         }
         None => {

trunk/src/libstd/io.rs

@@ -619,7 +619,7 @@ pub trait ReaderUtil {
 
 impl<T:Reader> ReaderUtil for T {
 
-    fn read_bytes(&self,len: uint) -> ~[u8] {
+    fn read_bytes(&self, len: uint) -> ~[u8] {
         let mut bytes = vec::with_capacity(len);
         unsafe { vec::raw::set_len(&mut bytes, len); }
 

trunk/src/libstd/rt/args.rs

@@ -55,11 +55,10 @@ pub fn clone() -> Option<~[~str]> {
 mod imp {
     use libc;
     use option::{Option, Some, None};
-    use iterator::Iterator;
+    use iterator::{Iterator, range};
     use str;
     use unstable::finally::Finally;
     use util;
-    use vec;
 
     pub unsafe fn init(argc: int, argv: **u8) {
         let args = load_argc_and_argv(argc, argv);
@@ -112,9 +111,11 @@ mod imp {
 
     // Copied from `os`.
     unsafe fn load_argc_and_argv(argc: int, argv: **u8) -> ~[~str] {
-        do vec::from_fn(argc as uint) |i| {
-            str::raw::from_c_str(*(argv as **libc::c_char).offset(i as int))
+        let mut args = ~[];
+        for i in range(0u, argc as uint) {
+            args.push(str::raw::from_c_str(*(argv as **libc::c_char).offset(i as int)));
         }
+        args
     }
 
     #[cfg(stage0)]

trunk/src/libstd/rt/local_ptr.rs

@@ -121,20 +121,27 @@ pub unsafe fn borrow<T>(f: &fn(&mut T)) {
 /// For the Scheduler pointer to be aliased
 pub unsafe fn unsafe_borrow<T>() -> *mut T {
     let key = tls_key();
-    let void_ptr = tls::get(key);
+    let mut void_ptr: *mut c_void = tls::get(key);
     if void_ptr.is_null() {
         rtabort!("thread-local pointer is null. bogus!");
     }
-    void_ptr as *mut T
+    let ptr: *mut *mut c_void = &mut void_ptr;
+    let ptr: *mut ~T = ptr as *mut ~T;
+    let ptr: *mut T = &mut **ptr;
+    return ptr;
 }
 
 pub unsafe fn try_unsafe_borrow<T>() -> Option<*mut T> {
     let key = tls_key();
-    let void_ptr = tls::get(key);
+    let mut void_ptr: *mut c_void = tls::get(key);
     if void_ptr.is_null() {
-        None
-    } else {
-        Some(void_ptr as *mut T)
+        return None;
+    }
+    {
+        let ptr: *mut *mut c_void = &mut void_ptr;
+        let ptr: *mut ~T = ptr as *mut ~T;
+        let ptr: *mut T = &mut **ptr;
+        return Some(ptr);
     }
 }
 

trunk/src/libstd/rt/mod.rs

@@ -59,7 +59,7 @@ Several modules in `core` are clients of `rt`:
 use cell::Cell;
 use clone::Clone;
 use container::Container;
-use iterator::Iterator;
+use iterator::{Iterator, range};
 use option::{Option, None, Some};
 use ptr::RawPtr;
 use rt::local::Local;
@@ -71,8 +71,7 @@ use rt::work_queue::WorkQueue;
 use rt::uv::uvio::UvEventLoop;
 use unstable::atomics::{AtomicInt, SeqCst};
 use unstable::sync::UnsafeArc;
-use vec;
-use vec::{OwnedVector, MutableVector, ImmutableVector};
+use vec::{OwnedVector, MutableVector};
 
 /// The global (exchange) heap.
 pub mod global_heap;
@@ -252,21 +251,25 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int {
 
     // Create a work queue for each scheduler, ntimes. Create an extra
     // for the main thread if that flag is set. We won't steal from it.
-    let work_queues: ~[WorkQueue<~Task>] = vec::from_fn(nscheds, |_| WorkQueue::new());
+    let mut work_queues = ~[];
+    for _ in range(0u, nscheds) {
+        let work_queue: WorkQueue<~Task> = WorkQueue::new();
+        work_queues.push(work_queue);
+    }
 
     // The schedulers.
     let mut scheds = ~[];
     // Handles to the schedulers. When the main task ends these will be
     // sent the Shutdown message to terminate the schedulers.
     let mut handles = ~[];
 
-    for work_queue in work_queues.iter() {
+    for i in range(0u, nscheds) {
         rtdebug!("inserting a regular scheduler");
 
         // Every scheduler is driven by an I/O event loop.
         let loop_ = ~UvEventLoop::new();
         let mut sched = ~Scheduler::new(loop_,
-                                        work_queue.clone(),
+                                        work_queues[i].clone(),
                                         work_queues.clone(),
                                         sleepers.clone());
         let handle = sched.make_handle();
@@ -355,8 +358,9 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int {
     }
 
     // Run each remaining scheduler in a thread.
-    for sched in scheds.move_rev_iter() {
+    while !scheds.is_empty() {
         rtdebug!("creating regular schedulers");
+        let sched = scheds.pop();
         let sched_cell = Cell::new(sched);
         let thread = do Thread::start {
             let mut sched = sched_cell.take();

trunk/src/libstd/rt/util.rs

@@ -11,7 +11,7 @@
 use container::Container;
 use from_str::FromStr;
 use libc;
-use option::{Some, None, Option};
+use option::{Some, None};
 use os;
 use str::StrSlice;
 use unstable::atomics::{AtomicInt, INIT_ATOMIC_INT, SeqCst};
@@ -57,13 +57,7 @@ pub fn limit_thread_creation_due_to_osx_and_valgrind() -> bool {
 /// either `RUST_THREADS` or `num_cpus`.
 pub fn default_sched_threads() -> uint {
     match os::getenv("RUST_THREADS") {
-        Some(nstr) => {
-            let opt_n: Option<uint> = FromStr::from_str(nstr);
-            match opt_n {
-                Some(n) if n > 0 => n,
-                _ => rtabort!("`RUST_THREADS` is `%s`, should be a positive integer", nstr)
-            }
-        }
+        Some(nstr) => FromStr::from_str(nstr).unwrap(),
         None => {
             if limit_thread_creation_due_to_osx_and_valgrind() {
                 1

trunk/src/test/run-fail/test-tasks-invalid-value.rs renamed to trunk/src/test/run-fail/test-threads-invalid-value.rs

@@ -11,7 +11,7 @@
 // This checks that RUST_TEST_TASKS not being 1, 2, ... is detected
 // properly.
 
-// error-pattern:should be a positive integer
+// error-pattern:should be a non-negative integer
 // compile-flags: --test
 // exec-env:RUST_TEST_TASKS=foo