Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.

1 files changed, 6 insertions, 6 deletions

diff --git a/components/net/sniffer_task.rs b/components/net/sniffer_task.rs
index 2fcc0394f52..2b9b2363a0a 100644
--- a/components/net/sniffer_task.rs
+++ b/components/net/sniffer_task.rs
@@ -3,16 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //! A task that sniffs data
-use std::comm::{channel, Receiver, Sender};
-use std::task::TaskBuilder;
+use std::sync::mpsc::{channel, Receiver, Sender};
+use std::thread::Builder;
 use resource_task::{TargetedLoadResponse};
 
 pub type SnifferTask = Sender<TargetedLoadResponse>;
 
 pub fn new_sniffer_task() -> SnifferTask {
     let(sen, rec) = channel();
-    let builder = TaskBuilder::new().named("SnifferManager");
-    builder.spawn(proc() {
+    let builder = Builder::new().name("SnifferManager".to_string());
+    builder.spawn(move || {
         SnifferManager::new(rec).start();
     });
     sen
@@ -33,9 +33,9 @@ impl SnifferManager {
 impl SnifferManager {
     fn start(self) {
         loop {
-            match self.data_receiver.recv_opt() {
+            match self.data_receiver.recv() {
                 Ok(snif_data) => {
-                    let _ = snif_data.consumer.send_opt(snif_data.load_response);
+                    let _ = snif_data.consumer.send(snif_data.load_response);
                 }
                 Err(_) => break,
             }