Auto merge of #10725 - frewsxcv:net-cleanup, r=KiChjang

A few minor `net` component cleanups.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10725)
<!-- Reviewable:end -->

1 files changed, 10 insertions, 12 deletions

diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index bb839176b14..0bc6f19e053 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -133,7 +133,7 @@ fn start_sending_opt(start_chan: LoadConsumer, metadata: Metadata) -> Result<Pro
 
 /// Create a ResourceThread
 pub fn new_resource_thread(user_agent: String,
-                         devtools_chan: Option<Sender<DevtoolsControlMsg>>) -> ResourceThread {
+                           devtools_chan: Option<Sender<DevtoolsControlMsg>>) -> ResourceThread {
     let hsts_preload = HstsList::from_servo_preload();
     let (setup_chan, setup_port) = ipc::channel().unwrap();
     let setup_chan_clone = setup_chan.clone();
@@ -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()
         }
     }
 }