Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Squashing a few compiler warnings.

Browse source
This commit is contained in:
Adenilson Cavalcanti 2015-04-13 14:25:42 -07:00
parent 1f9c2f9b34
commit d2b7cbd4ef
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/devtools/actors/timeline.rs
View file

@ -11,7 +11,7 @@ use std::net::TcpStream;
use std::old_io::timer::sleep; use std::old_io::timer::sleep;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::time::duration::Duration; 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 time::precise_time_ns;
use actor::{Actor, ActorRegistry}; 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; **self.is_recording.lock().as_mut().unwrap() = true;
let (tx, rx) = channel::<TimelineMarker>(); 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(); *self.stream.borrow_mut() = stream.try_clone().ok();
@ -254,7 +254,7 @@ impl Actor for TimelineActor {
}; };
stream.write_json_packet(&msg); 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() { if let Some(ref actor_name) = *self.framerate_actor.borrow() {
registry.drop_actor_later(actor_name.clone()); registry.drop_actor_later(actor_name.clone());

1
components/devtools/lib.rs
View file

@ -14,6 +14,7 @@
#![feature(collections, std_misc)] #![feature(collections, std_misc)]
#![feature(io)] #![feature(io)]
#![feature(net)] #![feature(net)]
#![feature(old_io)]
#![allow(non_snake_case)] #![allow(non_snake_case)]

2
components/script/dom/window.rs
View file

@ -805,7 +805,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
fn emit_timeline_marker(self, marker: TimelineMarker) { fn emit_timeline_marker(self, marker: TimelineMarker) {
let sender = self.devtools_marker_sender.borrow(); let sender = self.devtools_marker_sender.borrow();
let sender = sender.as_ref().expect("There is no marker sender"); 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>) { fn set_devtools_timeline_marker(self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>) {

2
components/script/script_task.rs
View file

@ -1349,7 +1349,7 @@ impl ScriptTask {
fn emit_timeline_marker(&self, marker: TimelineMarker) { fn emit_timeline_marker(&self, marker: TimelineMarker) {
let sender = self.devtools_marker_sender.borrow(); let sender = self.devtools_marker_sender.borrow();
let sender = sender.as_ref().expect("There is no marker sender"); 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>) { pub fn set_devtools_timeline_marker(&self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>) {