From a10b574d44713cc6748c6f0d03bdf0e49328f5bd Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Tue, 19 Apr 2016 09:52:47 -0400
Subject: [PATCH] Flatten and cleanup `ConstellationListener::is_cancelled`.

---
 components/net/resource_thread.rs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index bb839176b14..e97e1e491de 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -227,17 +227,15 @@ impl CancellationListener {
     }
 
     pub fn is_cancelled(&self) -> bool {
-        match self.cancel_resource {
-            Some(ref resource) => {
-                match resource.cancel_receiver.try_recv() {
-                    Ok(_) => {
-                        self.cancel_status.set(true);
-                        true
-                    },
-                    Err(_) => self.cancel_status.get(),
-                }
-            },
-            None => false,      // channel doesn't exist!
+        let resource = match self.cancel_resource {
+            Some(ref resource) => resource,
+            None => return false,  // channel doesn't exist!
+        };
+        if resource.cancel_receiver.try_recv().is_ok() {
+            self.cancel_status.set(true);
+            true
+        } else {
+            self.cancel_status.get()
         }
     }
 }