From d2b7cbd4ef64f60c309935c2e966f8fedd126a02 Mon Sep 17 00:00:00 2001 From: Adenilson Cavalcanti Date: Mon, 13 Apr 2015 14:25:42 -0700 Subject: [PATCH 1/2] Squashing a few compiler warnings. --- components/devtools/actors/timeline.rs | 8 ++++---- components/devtools/lib.rs | 1 + components/script/dom/window.rs | 2 +- components/script/script_task.rs | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs index 62f05c2fa91..92482ca40b1 100644 --- 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::(); - 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 index c5057d79f90..90e9718728a 100644 --- 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 index 5bd20138550..a8a560179aa 100644 --- 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) { diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 134c629b091..78d2c108b8c 100644 --- 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) { From a233cb5ef9e462ce644df6cd02f92ddc3b1166f1 Mon Sep 17 00:00:00 2001 From: Adenilson Cavalcanti Date: Mon, 13 Apr 2015 14:44:19 -0700 Subject: [PATCH 2/2] Using unwrap() as suggested in review. --- components/devtools/actors/timeline.rs | 4 ++-- components/script/dom/window.rs | 2 +- components/script/script_task.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs index 92482ca40b1..94ab37ce3c7 100644 --- a/components/devtools/actors/timeline.rs +++ b/components/devtools/actors/timeline.rs @@ -214,7 +214,7 @@ impl Actor for TimelineActor { **self.is_recording.lock().as_mut().unwrap() = true; let (tx, rx) = channel::(); - let _ = self.script_sender.send(SetTimelineMarkers(self.pipeline, self.marker_types.clone(), tx)); + self.script_sender.send(SetTimelineMarkers(self.pipeline, self.marker_types.clone(), tx)).unwrap(); *self.stream.borrow_mut() = stream.try_clone().ok(); @@ -254,7 +254,7 @@ impl Actor for TimelineActor { }; stream.write_json_packet(&msg); - let _ = self.script_sender.send(DropTimelineMarkers(self.pipeline, self.marker_types.clone())); + self.script_sender.send(DropTimelineMarkers(self.pipeline, self.marker_types.clone())).unwrap(); if let Some(ref actor_name) = *self.framerate_actor.borrow() { registry.drop_actor_later(actor_name.clone()); diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index a8a560179aa..408f4da4ea7 100644 --- 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"); - let _ = sender.send(marker); + sender.send(marker).unwrap(); } fn set_devtools_timeline_marker(self, marker: TimelineMarkerType, reply: Sender) { diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 78d2c108b8c..62f7381f77e 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1017,7 +1017,7 @@ impl ScriptTask { match self.page { PageToRemove::Root => *self.script_task.page.borrow_mut() = None, PageToRemove::Child(id) => { - let _ = self.script_task.root_page().remove(id); + self.script_task.root_page().remove(id).unwrap(); } } } @@ -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"); - let _ = sender.send(marker); + sender.send(marker).unwrap(); } pub fn set_devtools_timeline_marker(&self, marker: TimelineMarkerType, reply: Sender) {