rollup merge of #22435: aturon/final-stab-thread

Conflicts:
	src/test/bench/rt-messaging-ping-pong.rs
	src/test/bench/rt-parfib.rs
	src/test/bench/task-perf-spawnalot.rs

diff --cc src/libcollections/dlist.rs
Simple merge

diff --cc src/libcore/cell.rs
Simple merge

diff --cc src/librustdoc/lib.rs
Simple merge

diff --cc src/libstd/net/tcp.rs
Simple merge

diff --cc src/libstd/old_io/mod.rs
Simple merge

diff --cc src/libstd/old_io/net/tcp.rs
Simple merge

diff --cc src/libstd/old_io/process.rs
Simple merge

diff --cc src/libstd/process.rs
Simple merge

diff --cc src/libstd/rt/util.rs
Simple merge

diff --cc src/libtest/lib.rs
Simple merge

diff --cc src/test/bench/msgsend-pipes-shared.rs
index 868202f71e10f5931310307be6ab2f469265513b,3a8d65d73c96236398a8c700d3b7fd819eda4a20..208f088442b9b401c4f13c13c0188f71f3d13663
--- 1/src/test/bench/msgsend-pipes-shared.rs
--- 2/src/test/bench/msgsend-pipes-shared.rs
+++ b/src/test/bench/msgsend-pipes-shared.rs
@@@ -19,8 -19,9 +19,8 @@@
  // version.
  
  use std::sync::mpsc::{channel, Sender, Receiver};
 -use std::os;
  use std::env;
- use std::thread::Thread;
+ use std::thread;
  use std::time::Duration;
  
  fn move_out<T>(_x: T) {}

diff --cc src/test/bench/msgsend-pipes.rs
index c6319ad65175c96d2dfed8a8a1cae16f0f770f8a,3f05b46aa71ea2db298bb0ae85fd32d3b8a8fa2f..76b91f0295bb56abbad11b5c2fa6d86d863519ba
--- 1/src/test/bench/msgsend-pipes.rs
--- 2/src/test/bench/msgsend-pipes.rs
+++ b/src/test/bench/msgsend-pipes.rs
@@@ -15,8 -15,9 +15,8 @@@
  // I *think* it's the same, more or less.
  
  use std::sync::mpsc::{channel, Sender, Receiver};
 -use std::os;
  use std::env;
- use std::thread::Thread;
+ use std::thread;
  use std::time::Duration;
  
  enum request {

diff --cc src/test/bench/rt-messaging-ping-pong.rs
index 4d0887f48b321d69e097dc34a25841eac20ae205,1ecd983a5c50a20c2e04c3808a1278e52e3bfcd1..b9512324e42d6426a5c92908c4a4825eb91fb7a4
--- 1/src/test/bench/rt-messaging-ping-pong.rs
--- 2/src/test/bench/rt-messaging-ping-pong.rs
+++ b/src/test/bench/rt-messaging-ping-pong.rs
@@@ -18,8 -18,8 +18,8 @@@
  // except according to those terms.
  
  use std::sync::mpsc::channel;
 -use std::os;
 +use std::env;
- use std::thread::Thread;
+ use std::thread;
  
  // This is a simple bench that creates M pairs of tasks. These
  // tasks ping-pong back and forth over a pair of streams. This is a

diff --cc src/test/bench/rt-parfib.rs
index dadf1a3fd9a1d32b5d89d3a85fceaccfaee3ca46,4ab937d47e307a8a4ab72186f38d4d1d8d470234..d420023cf0059eacb92a27f458d0b8dfde1ef4b5
--- 1/src/test/bench/rt-parfib.rs
--- 2/src/test/bench/rt-parfib.rs
+++ b/src/test/bench/rt-parfib.rs
@@@ -9,8 -9,8 +9,8 @@@
  // except according to those terms.
  
  use std::sync::mpsc::channel;
 -use std::os;
 +use std::env;
- use std::thread::Thread;
+ use std::thread;
  
  // A simple implementation of parfib. One subtree is found in a new
  // task and communicated over a oneshot pipe, the other is found

diff --cc src/test/bench/shootout-binarytrees.rs
Simple merge

diff --cc src/test/bench/shootout-chameneos-redux.rs
Simple merge

diff --cc src/test/bench/shootout-fannkuch-redux.rs
Simple merge

diff --cc src/test/bench/shootout-mandelbrot.rs
index c0951ccda6ca9736b34ceab312bb33530761e9bb,fa5ddb1567a6a759d8cb331e56fc8c1b5b4c7e37..8ab3b14a1f51d735847cad9ea3457ee35313ea2d
--- 1/src/test/bench/shootout-mandelbrot.rs
--- 2/src/test/bench/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout-mandelbrot.rs
@@@ -43,10 -43,10 +43,10 @@@
  // ignore-pretty very bad with line comments
  
  use std::old_io;
 -use std::os;
 +use std::env;
  use std::simd::f64x2;
  use std::sync::Arc;
- use std::thread::Thread;
+ use std::thread;
  
  const ITER: usize = 50;
  const LIMIT: f64 = 2.0;

diff --cc src/test/bench/shootout-pfib.rs
index 45163510a9400b92c3f6830337aa86dd2ab61bdc,97e5533f2de4875b68021985cfdff2148cb6e75d..a542c81f2394ea2523717305de5956469606a2a9
--- 1/src/test/bench/shootout-pfib.rs
--- 2/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@@ -21,13 -21,14 +21,13 @@@
  extern crate getopts;
  
  use std::sync::mpsc::{channel, Sender};
 -use std::os;
  use std::env;
  use std::result::Result::{Ok, Err};
- use std::thread::Thread;
+ use std::thread;
  use std::time::Duration;
  
 -fn fib(n: int) -> int {
 -    fn pfib(tx: &Sender<int>, n: int) {
 +fn fib(n: isize) -> isize {
 +    fn pfib(tx: &Sender<isize>, n: isize) {
          if n == 0 {
              tx.send(0).unwrap();
          } else if n <= 2 {

diff --cc src/test/bench/shootout-spectralnorm.rs
Simple merge

diff --cc src/test/bench/shootout-threadring.rs
Simple merge

diff --cc src/test/bench/task-perf-jargon-metal-smoke.rs
index a9848137e755a398794b595b6364ee34636bb178,923be213fd3972e46860b67af49f286976b96084..e36d685d7c6ea9b73f85d29b147510ec1fc69030
--- 1/src/test/bench/task-perf-jargon-metal-smoke.rs
--- 2/src/test/bench/task-perf-jargon-metal-smoke.rs
+++ b/src/test/bench/task-perf-jargon-metal-smoke.rs
@@@ -18,8 -18,9 +18,8 @@@
  // ignore-pretty very bad with line comments
  
  use std::sync::mpsc::{channel, Sender};
 -use std::os;
  use std::env;
- use std::thread::Thread;
+ use std::thread;
  
  fn child_generation(gens_left: uint, tx: Sender<()>) {
      // This used to be O(n^2) in the number of generations that ever existed.

diff --cc src/test/bench/task-perf-spawnalot.rs
index ba5e25634e8cded324ee9225cdb8fbd6fa8970c7,d10d9cb460f34deed7e284796bac5527b26eaceb..69b9e89dbc5228c42f3d7f9363ce60397ee499dc
--- 1/src/test/bench/task-perf-spawnalot.rs
--- 2/src/test/bench/task-perf-spawnalot.rs
+++ b/src/test/bench/task-perf-spawnalot.rs
@@@ -8,13 -8,14 +8,13 @@@
  // option. This file may not be copied, modified, or distributed
  // except according to those terms.
  
 -use std::os;
  use std::env;
- use std::thread::Thread;
+ use std::thread;
  
 -fn f(n: uint) {
 +fn f(n: usize) {
      let mut i = 0u;
      while i < n {
-         let _ = Thread::scoped(move|| g()).join();
+         let _ = thread::spawn(move|| g()).join();
          i += 1u;
      }
  }
@@@ -22,15 -23,15 +22,15 @@@
  fn g() { }
  
  fn main() {
 -    let args = os::args();
 +    let args = env::args();
      let args = if env::var_os("RUST_BENCH").is_some() {
          vec!("".to_string(), "400".to_string())
 -    } else if args.len() <= 1u {
 +    } else if args.len() <= 1 {
          vec!("".to_string(), "10".to_string())
      } else {
 -        args.into_iter().collect()
 +        args.collect()
      };
      let n = args[1].parse().unwrap();
 -    let mut i = 0u;
 -    while i < n { thread::spawn(move|| f(n) ); i += 1u; }
 +    let mut i = 0;
-     while i < n { Thread::spawn(move|| f(n) ); i += 1u; }
++    while i < n { thread::spawn(move|| f(n) ); i += 1; }
  }