auto merge of #4017 : Ms2ger/servo/sniffertask, r=jdm

1 files changed, 18 insertions, 21 deletions

diff --git a/components/net/sniffer_task.rs b/components/net/sniffer_task.rs
index a39e6fc2beb..9df39e59a51 100644
--- a/components/net/sniffer_task.rs
+++ b/components/net/sniffer_task.rs
@@ -10,37 +10,34 @@ use resource_task::{LoadResponse};
 pub type SnifferTask = Sender<LoadResponse>;
 
 pub fn new_sniffer_task(next_rx: Sender<LoadResponse>) -> SnifferTask {
-  let(sen, rec) = channel();
-  let builder = TaskBuilder::new().named("SnifferManager");
-  builder.spawn(proc(){
-    SnifferManager::new(rec).start(next_rx);
-  });
-  sen
+    let (sen, rec) = channel();
+    let builder = TaskBuilder::new().named("SnifferManager");
+    builder.spawn(proc() {
+        SnifferManager::new(rec).start(next_rx);
+    });
+    sen
 }
 
 struct SnifferManager {
-  data_receiver: Receiver<LoadResponse>,
+    data_receiver: Receiver<LoadResponse>,
 }
 
 impl SnifferManager {
-  fn new(data_receiver: Receiver <LoadResponse>) -> SnifferManager {
-    SnifferManager {
-      data_receiver: data_receiver,
+    fn new(data_receiver: Receiver<LoadResponse>) -> SnifferManager {
+        SnifferManager {
+            data_receiver: data_receiver,
+        }
     }
-  }
 }
 
 impl SnifferManager {
-  fn start(&self, next_rx: Sender<LoadResponse>) {
-    loop {
-      match self.data_receiver.try_recv() {
-        Ok(snif_data) => next_rx.send(snif_data),
-        Err(e) => {
-          if e == Disconnected {
-            break
-          }
+    fn start(&self, next_rx: Sender<LoadResponse>) {
+        loop {
+            match self.data_receiver.try_recv() {
+                Ok(snif_data) => next_rx.send(snif_data),
+                Err(Disconnected) => break,
+                Err(_) => (),
+            }
         }
-      }
     }
-  }
 }