Squashing a few compiler warnings.

servo · Apr 13, 2015 · d2b7cbd · d2b7cbd
1 parent 1f9c2f9
commit d2b7cbd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs
@@ -11,7 +11,7 @@ use std::net::TcpStream;
 use std::old_io::timer::sleep;
 use std::sync::{Arc, Mutex};
 use std::time::duration::Duration;
-use std::sync::mpsc::{channel, Sender, Receiver, TryRecvError};
+use std::sync::mpsc::{channel, Sender, Receiver};
 use time::precise_time_ns;
 
 use actor::{Actor, ActorRegistry};
@@ -182,7 +182,7 @@ impl TimelineActor {
                             }
                         }
 
-                        Err(TryRecvError) => break
+                        Err(_) => break
                     }
                 }
 
@@ -214,7 +214,7 @@ impl Actor for TimelineActor {
                 **self.is_recording.lock().as_mut().unwrap() = true;
 
                 let (tx, rx) = channel::<TimelineMarker>();
-                self.script_sender.send(SetTimelineMarkers(self.pipeline, self.marker_types.clone(), tx));
+                let _ = self.script_sender.send(SetTimelineMarkers(self.pipeline, self.marker_types.clone(), tx));
 
                 *self.stream.borrow_mut() = stream.try_clone().ok();
 
@@ -254,7 +254,7 @@ impl Actor for TimelineActor {
                 };
 
                 stream.write_json_packet(&msg);
-                self.script_sender.send(DropTimelineMarkers(self.pipeline, self.marker_types.clone()));
+                let _ = self.script_sender.send(DropTimelineMarkers(self.pipeline, self.marker_types.clone()));
 
                 if let Some(ref actor_name) = *self.framerate_actor.borrow() {
                     registry.drop_actor_later(actor_name.clone());

diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
@@ -14,6 +14,7 @@
 #![feature(collections, std_misc)]
 #![feature(io)]
 #![feature(net)]
+#![feature(old_io)]
 
 #![allow(non_snake_case)]
 

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
@@ -805,7 +805,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
     fn emit_timeline_marker(self, marker: TimelineMarker) {
         let sender = self.devtools_marker_sender.borrow();
         let sender = sender.as_ref().expect("There is no marker sender");
-        sender.send(marker);
+        let _ = sender.send(marker);
     }
 
     fn set_devtools_timeline_marker(self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>) {

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
@@ -1349,7 +1349,7 @@ impl ScriptTask {
     fn emit_timeline_marker(&self, marker: TimelineMarker) {
         let sender = self.devtools_marker_sender.borrow();
         let sender = sender.as_ref().expect("There is no marker sender");
-        sender.send(marker);
+        let _ = sender.send(marker);
     }
 
     pub fn set_devtools_timeline_marker(&self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>) {