---

yaml
---
r: 163685
b: refs/heads/snap-stage3
c: f6328b6
h: refs/heads/master
i:
  163683: bd81f1b
v: v3

Author: aliblong

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cbe9fb45bc705a89f23b434c686544d490923596
+refs/heads/snap-stage3: f6328b60da4c506f0f15dc0194f9b9a89aa61a79
 refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/mk/crates.mk

@@ -51,7 +51,7 @@
 
 TARGET_CRATES := libc std flate arena term \
                  serialize getopts collections test time rand \
-                 log regex graphviz core rbml alloc \
+                 log regex graphviz core rbml alloc rustrt \
                  unicode
 RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_driver rustc_trans rustc_back rustc_llvm 
 HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc regex_macros fmt_macros
@@ -62,8 +62,9 @@ DEPS_core :=
 DEPS_libc := core
 DEPS_unicode := core
 DEPS_alloc := core libc native:jemalloc
-DEPS_std := core libc rand alloc collections unicode \
-	native:rust_builtin native:backtrace native:rustrt_native
+DEPS_rustrt := alloc core libc collections native:rustrt_native
+DEPS_std := core libc rand alloc collections rustrt unicode \
+	native:rust_builtin native:backtrace
 DEPS_graphviz := std
 DEPS_syntax := std term serialize log fmt_macros arena libc
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \

branches/snap-stage3/src/compiletest/runtest.rs

@@ -32,7 +32,7 @@ use std::io;
 use std::os;
 use std::str;
 use std::string::String;
-use std::thread::Thread;
+use std::task;
 use std::time::Duration;
 use test::MetricMap;
 
@@ -445,9 +445,9 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
             loop {
                 //waiting 1 second for gdbserver start
                 timer::sleep(Duration::milliseconds(1000));
-                let result = Thread::spawn(move || {
+                let result = task::try(move || {
                     tcp::TcpStream::connect("127.0.0.1:5039").unwrap();
-                }).join();
+                });
                 if result.is_err() {
                     continue;
                 }

branches/snap-stage3/src/doc/guide-tasks.md

@@ -1,7 +1,5 @@
 % The Rust Tasks and Communication Guide
 
-**NOTE** This guide is badly out of date an needs to be rewritten.
-
 # Introduction
 
 Rust provides safe concurrent abstractions through a number of core library
@@ -24,7 +22,7 @@ from shared mutable state.
 At its simplest, creating a task is a matter of calling the `spawn` function
 with a closure argument. `spawn` executes the closure in the new task.
 
-```{rust,ignore}
+```{rust}
 # use std::task::spawn;
 
 // Print something profound in a different task using a named function
@@ -51,7 +49,7 @@ closure is limited to capturing `Send`-able data from its environment
 ensures that `spawn` can safely move the entire closure and all its
 associated state into an entirely different task for execution.
 
-```{rust,ignore}
+```{rust}
 # use std::task::spawn;
 # fn generate_task_number() -> int { 0 }
 // Generate some state locally
@@ -77,7 +75,7 @@ The simplest way to create a channel is to use the `channel` function to create
 of a channel, and a **receiver** is the receiving endpoint. Consider the following
 example of calculating two results concurrently:
 
-```{rust,ignore}
+```{rust}
 # use std::task::spawn;
 
 let (tx, rx): (Sender<int>, Receiver<int>) = channel();
@@ -98,15 +96,15 @@ stream for sending and receiving integers (the left-hand side of the `let`,
 `(tx, rx)`, is an example of a destructuring let: the pattern separates a tuple
 into its component parts).
 
-```{rust,ignore}
+```{rust}
 let (tx, rx): (Sender<int>, Receiver<int>) = channel();
 ```
 
 The child task will use the sender to send data to the parent task, which will
 wait to receive the data on the receiver. The next statement spawns the child
 task.
 
-```{rust,ignore}
+```{rust}
 # use std::task::spawn;
 # fn some_expensive_computation() -> int { 42 }
 # let (tx, rx) = channel();
@@ -125,7 +123,7 @@ computation, then sends the result over the captured channel.
 Finally, the parent continues with some other expensive computation, then waits
 for the child's result to arrive on the receiver:
 
-```{rust,ignore}
+```{rust}
 # fn some_other_expensive_computation() {}
 # let (tx, rx) = channel::<int>();
 # tx.send(0);
@@ -156,7 +154,7 @@ spawn(move || {
 
 Instead we can clone the `tx`, which allows for multiple senders.
 
-```{rust,ignore}
+```{rust}
 let (tx, rx) = channel();
 
 for init_val in range(0u, 3) {
@@ -181,7 +179,7 @@ Note that the above cloning example is somewhat contrived since you could also
 simply use three `Sender` pairs, but it serves to illustrate the point. For
 reference, written with multiple streams, it might look like the example below.
 
-```{rust,ignore}
+```{rust}
 # use std::task::spawn;
 
 // Create a vector of ports, one for each child task
@@ -205,7 +203,7 @@ getting the result later.
 
 The basic example below illustrates this.
 
-```{rust,ignore}
+```{rust}
 use std::sync::Future;
 
 # fn main() {
@@ -232,7 +230,7 @@ called.
 Here is another example showing how futures allow you to background
 computations. The workload will be distributed on the available cores.
 
-```{rust,ignore}
+```{rust}
 # use std::num::Float;
 # use std::sync::Future;
 fn partial_sum(start: uint) -> f64 {
@@ -270,7 +268,7 @@ Here is a small example showing how to use Arcs. We wish to run concurrently
 several computations on a single large vector of floats. Each task needs the
 full vector to perform its duty.
 
-```{rust,ignore}
+```{rust}
 use std::num::Float;
 use std::rand;
 use std::sync::Arc;
@@ -297,7 +295,7 @@ The function `pnorm` performs a simple computation on the vector (it computes
 the sum of its items at the power given as argument and takes the inverse power
 of this value). The Arc on the vector is created by the line:
 
-```{rust,ignore}
+```{rust}
 # use std::rand;
 # use std::sync::Arc;
 # fn main() {
@@ -311,7 +309,7 @@ the wrapper and not its contents. Within the task's procedure, the captured
 Arc reference can be used as a shared reference to the underlying vector as
 if it were local.
 
-```{rust,ignore}
+```{rust}
 # use std::rand;
 # use std::sync::Arc;
 # fn pnorm(nums: &[f64], p: uint) -> f64 { 4.0 }
@@ -348,17 +346,17 @@ and `()`, callers can pattern-match on a result to check whether it's an `Ok`
 result with an `int` field (representing a successful result) or an `Err` result
 (representing termination with an error).
 
-```{rust,ignore}
-# use std::thread::Thread;
+```{rust}
+# use std::task;
 # fn some_condition() -> bool { false }
 # fn calculate_result() -> int { 0 }
-let result: Result<int, Box<std::any::Any + Send>> = Thread::spawn(move || {
+let result: Result<int, Box<std::any::Any + Send>> = task::try(move || {
     if some_condition() {
         calculate_result()
     } else {
         panic!("oops!");
     }
-}).join();
+});
 assert!(result.is_err());
 ```
 

branches/snap-stage3/src/doc/guide.md

@@ -5217,8 +5217,6 @@ the same function, so our binary is a little bit larger.
 
 # Tasks
 
-**NOTE**: this section is currently out of date and will be rewritten soon.
-
 Concurrency and parallelism are topics that are of increasing interest to a
 broad subsection of software developers. Modern computers are often multi-core,
 to the point that even embedded devices like cell phones have more than one
@@ -5233,7 +5231,7 @@ library, and not part of the language. This means that in the future, other
 concurrency libraries can be written for Rust to help in specific scenarios.
 Here's an example of creating a task:
 
-```{rust,ignore}
+```{rust}
 spawn(move || {
     println!("Hello from a task!");
 });
@@ -5263,7 +5261,7 @@ If tasks were only able to capture these values, they wouldn't be very useful.
 Luckily, tasks can communicate with each other through **channel**s. Channels
 work like this:
 
-```{rust,ignore}
+```{rust}
 let (tx, rx) = channel();
 
 spawn(move || {
@@ -5282,7 +5280,7 @@ which returns an `Result<T, TryRecvError>` and does not block.
 
 If you want to send messages to the task as well, create two channels!
 
-```{rust,ignore}
+```{rust}
 let (tx1, rx1) = channel();
 let (tx2, rx2) = channel();
 
@@ -5342,7 +5340,7 @@ we'll just get the value immediately.
 Tasks don't always succeed, they can also panic. A task that wishes to panic
 can call the `panic!` macro, passing a message:
 
-```{rust,ignore}
+```{rust}
 spawn(move || {
     panic!("Nope.");
 });
@@ -5351,7 +5349,7 @@ spawn(move || {
 If a task panics, it is not possible for it to recover. However, it can
 notify other tasks that it has panicked. We can do this with `task::try`:
 
-```{rust,ignore}
+```{rust}
 use std::task;
 use std::rand;
 

branches/snap-stage3/src/doc/intro.md

@@ -389,13 +389,11 @@ safe concurrent programs.
 Here's an example of a concurrent Rust program:
 
 ```{rust}
-use std::thread::Thread;
-
 fn main() {
     for _ in range(0u, 10u) {
-        Thread::spawn(move || {
+        spawn(move || {
             println!("Hello, world!");
-        }).detach();
+        });
     }
 }
 ```
@@ -405,8 +403,7 @@ This program creates ten threads, who all print `Hello, world!`. The
 double bars `||`. (The `move` keyword indicates that the closure takes
 ownership of any data it uses; we'll have more on the significance of
 this shortly.) This closure is executed in a new thread created by
-`spawn`. The `detach` method means that the child thread is allowed to
-outlive its parent.
+`spawn`.
 
 One common form of problem in concurrent programs is a 'data race.'
 This occurs when two different threads attempt to access the same
@@ -421,15 +418,13 @@ problem.
 Let's see an example. This Rust code will not compile:
 
 ```{rust,ignore}
-use std::thread::Thread;
-
 fn main() {
     let mut numbers = vec![1i, 2i, 3i];
 
     for i in range(0u, 3u) {
-        Thread::spawn(move || {
+        spawn(move || {
             for j in range(0, 3) { numbers[j] += 1 }
-        }).detach();
+        });
     }
 }
 ```
@@ -474,21 +469,20 @@ mutation doesn't cause a data race.
 Here's what using an Arc with a Mutex looks like:
 
 ```{rust}
-use std::thread::Thread;
 use std::sync::{Arc,Mutex};
 
 fn main() {
     let numbers = Arc::new(Mutex::new(vec![1i, 2i, 3i]));
 
     for i in range(0u, 3u) {
         let number = numbers.clone();
-        Thread::spawn(move || {
+        spawn(move || {
             let mut array = number.lock();
 
             (*array)[i] += 1;
 
             println!("numbers[{}] is {}", i, (*array)[i]);
-        }).detach();
+        });
     }
 }
 ```
@@ -538,15 +532,13 @@ As an example, Rust's ownership system is _entirely_ at compile time. The
 safety check that makes this an error about moved values:
 
 ```{rust,ignore}
-use std::thread::Thread;
-
 fn main() {
     let vec = vec![1i, 2, 3];
 
     for i in range(1u, 3) {
-        Thread::spawn(move || {
+        spawn(move || {
             println!("{}", vec[i]);
-        }).detach();
+        });
     }
 }
 ```

branches/snap-stage3/src/liballoc/arc.rs

@@ -39,7 +39,6 @@ use heap::deallocate;
 ///
 /// ```rust
 /// use std::sync::Arc;
-/// use std::thread::Thread;
 ///
 /// fn main() {
 ///     let numbers = Vec::from_fn(100, |i| i as f32);
@@ -48,11 +47,11 @@ use heap::deallocate;
 ///     for _ in range(0u, 10) {
 ///         let child_numbers = shared_numbers.clone();
 ///
-///         Thread::spawn(move || {
+///         spawn(move || {
 ///             let local_numbers = child_numbers.as_slice();
 ///
 ///             // Work with the local numbers
-///         }).detach();
+///         });
 ///     }
 /// }
 /// ```

branches/snap-stage3/src/libcollections/binary_heap.rs

@@ -29,12 +29,14 @@
 //! use std::collections::BinaryHeap;
 //! use std::uint;
 //!
-//! #[deriving(Copy, Eq, PartialEq)]
+//! #[deriving(Eq, PartialEq)]
 //! struct State {
 //!     cost: uint,
 //!     position: uint
 //! }
 //!
+//! impl Copy for State {}
+//!
 //! // The priority queue depends on `Ord`.
 //! // Explicitly implement the trait so the queue becomes a min-heap
 //! // instead of a max-heap.

branches/snap-stage3/src/libcollections/btree/set.rs

@@ -762,8 +762,8 @@ mod test {
         expected: &'b [int],
     }
 
-    impl<'a, 'b, 'c> FnMut(&'c int) -> bool for Counter<'a, 'b> {
-        extern "rust-call" fn call_mut(&mut self, (&x,): (&'c int,)) -> bool {
+    impl<'a, 'b> FnMut(&int) -> bool for Counter<'a, 'b> {
+        extern "rust-call" fn call_mut(&mut self, (&x,): (&int,)) -> bool {
             assert_eq!(x, self.expected[*self.i]);
             *self.i += 1;
             true