From fc2076cd53c37ea244a0b89d7dd4b1eb8aeeb1d3 Mon Sep 17 00:00:00 2001
From: Renato Zannon <renato@rrsz.com.br>
Date: Thu, 19 Feb 2015 19:01:57 -0200
Subject: [PATCH] fix(rustup): use module-level thread functions

---
 src/server/acceptor.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/acceptor.rs b/src/server/acceptor.rs
index a4cc5b4a..a4d8c5b1 100644
--- a/src/server/acceptor.rs
+++ b/src/server/acceptor.rs
@@ -1,4 +1,4 @@
-use std::thread::{Thread, JoinGuard};
+use std::thread::{self, JoinGuard};
 use std::sync::Arc;
 use std::sync::mpsc;
 use net::NetworkAcceptor;
@@ -34,7 +34,7 @@ impl<A: NetworkAcceptor + 'static> AcceptorPool<A> {
         for _ in 0..threads { spawn() }
 
         // Spawn the supervisor
-        Thread::scoped(move || for () in supervisor_rx.iter() { spawn() })
+        thread::scoped(move || for () in supervisor_rx.iter() { spawn() })
     }
 }
 
@@ -43,7 +43,7 @@ where A: NetworkAcceptor + 'static,
       F: Fn(<A as NetworkAcceptor>::Stream) + Send + Sync + 'static {
     use std::old_io::EndOfFile;
 
-    Thread::spawn(move || {
+    thread::spawn(move || {
         let sentinel = Sentinel::new(supervisor, ());
 
         loop {