auto merge of #4148 : jdm/servo/sniffix, r=glennw

...locking recv_opt vs. non-blocking try_recv.

1 files changed, 4 insertions, 8 deletions

diff --git a/components/net/sniffer_task.rs b/components/net/sniffer_task.rs
index 05fade8ca90..2fcc0394f52 100644
--- a/components/net/sniffer_task.rs
+++ b/components/net/sniffer_task.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //! A task that sniffs data
-use std::comm::{channel, Receiver, Sender, Disconnected};
+use std::comm::{channel, Receiver, Sender};
 use std::task::TaskBuilder;
 use resource_task::{TargetedLoadResponse};
 
@@ -33,15 +33,11 @@ impl SnifferManager {
 impl SnifferManager {
     fn start(self) {
         loop {
-            match self.data_receiver.try_recv() {
+            match self.data_receiver.recv_opt() {
                 Ok(snif_data) => {
-                    let result = snif_data.consumer.send_opt(snif_data.load_response);
-                    if result.is_err() {
-                        break;
-                    }
+                    let _ = snif_data.consumer.send_opt(snif_data.load_response);
                 }
-                Err(Disconnected) => break,
-                Err(_) => (),
+                Err(_) => break,
             }
         }
     }