diff --git a/components/compositing/timer_scheduler.rs b/components/compositing/timer_scheduler.rs
index d29137be788..4dfaa9e8148 100644
--- a/components/compositing/timer_scheduler.rs
+++ b/components/compositing/timer_scheduler.rs
@@ -126,11 +126,10 @@ impl TimerScheduler {
     }
 
     fn run_event_loop(&self) {
-        loop {
-            match self.receive_next_task() {
-                Some(Task::HandleRequest(request)) => self.handle_request(request),
-                Some(Task::DispatchDueEvents) => self.dispatch_due_events(),
-                None => break,
+        while let Some(task) = self.receive_next_task() {
+            match task {
+                Task::HandleRequest(request) => self.handle_request(request),
+                Task::DispatchDueEvents => self.dispatch_due_events(),
             }
         }
     }
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 3706e7ca0d8..3ed7116c3d5 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -401,30 +401,30 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
         }
     });
 
-    loop {
-        match receiver.recv() {
-            Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::AddClient(stream))) => {
+    while let Ok(msg) = receiver.recv() {
+        match msg {
+            DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::AddClient(stream)) => {
                 let actors = actors.clone();
                 accepted_connections.push(stream.try_clone().unwrap());
                 spawn_named("DevtoolsClientHandler".to_owned(), move || {
                     handle_client(actors, stream.try_clone().unwrap())
                 })
             }
-            Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::FramerateTick(
-                        actor_name, tick))) =>
+            DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::FramerateTick(
+                        actor_name, tick)) =>
                 handle_framerate_tick(actors.clone(), actor_name, tick),
-            Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::NewGlobal(
-                        ids, script_sender, pageinfo))) =>
+            DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::NewGlobal(
+                        ids, script_sender, pageinfo)) =>
                 handle_new_global(actors.clone(), ids, script_sender, &mut actor_pipelines,
                                   &mut actor_workers, pageinfo),
-            Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ConsoleAPI(
+            DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ConsoleAPI(
                         id,
                         console_message,
-                        worker_id))) =>
+                        worker_id)) =>
                 handle_console_message(actors.clone(), id, worker_id, console_message,
                                        &actor_pipelines, &actor_workers),
-            Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::NetworkEvent(
-                        request_id, network_event))) => {
+            DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::NetworkEvent(
+                        request_id, network_event)) => {
                 // copy the accepted_connections vector
                 let mut connections = Vec::<TcpStream>::new();
                 for stream in &accepted_connections {
@@ -435,8 +435,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
                 handle_network_event(actors.clone(), connections, &actor_pipelines, &mut actor_requests,
                                      &actor_workers, PipelineId::fake_root_pipeline_id(), request_id, network_event);
             },
-            Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::ServerExitMsg)) |
-            Err(RecvError) => break
+            DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::ServerExitMsg) => break
         }
     }
     for connection in &mut accepted_connections {