Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11148 - mbrubeck:warnings, r=metajack

Browse source 
Fix some warnings

<!-- 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/11148)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-12 06:19:10 -07:00
commit d55884d73e
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/compositor.rs
View file

@ -512,7 +512,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
match ipc::channel() {
Ok((sender, receiver)) => {
self.time_profiler_chan.send(time::ProfilerMsg::Exit(sender));
receiver.recv();
let _ = receiver.recv();
},
Err(_) => {},
}

4
components/net/filemanager_thread.rs
View file

@ -18,14 +18,14 @@ pub struct FileManager {
}
impl FileManager {
fn new(recv: IpcReceiver<FileManagerThreadMsg>) -> FileManager {
pub fn new(recv: IpcReceiver<FileManagerThreadMsg>) -> FileManager {
FileManager {
receiver: recv,
idmap: RefCell::new(HashMap::new()),
}
}
fn new_thread() -> IpcSender<FileManagerThreadMsg> {
pub fn new_thread() -> IpcSender<FileManagerThreadMsg> {
let (chan, recv) = ipc::channel().unwrap();
spawn_named("FileManager".to_owned(), move || {

12
components/profile/time.rs
View file

@ -85,7 +85,7 @@ impl Formattable for Option<TimerMetadata> {
impl Formattable for ProfilerCategory {
// some categories are subcategories of LayoutPerformCategory
// and should be printed to indicate this
fn format(&self, output: &Option<OutputOptions>) -> String {
fn format(&self, _output: &Option<OutputOptions>) -> String {
let padding = match *self {
ProfilerCategory::LayoutStyleRecalc |
ProfilerCategory::LayoutRestyleDamagePropagation |
@ -213,7 +213,7 @@ impl Profiler {
match port.recv() {
Err(_) => break,
Ok(ProfilerMsg::Exit(chan)) => {
chan.send(());
let _ = chan.send(());
break;
},
_ => {}
@ -315,7 +315,7 @@ impl Profiler {
ProfilerMsg::Exit(chan) => {
heartbeats::cleanup();
self.print_buckets();
chan.send(());
let _ = chan.send(());
return false;
},
};
@ -334,7 +334,7 @@ impl Profiler {
Ok(file) => file,
};
write!(file, "_category_, _incremental?_, _iframe?_, _url_, _mean (ms)_, _median (ms)_, _min (ms)_, \
_max (ms)_, _events_\n");
_max (ms)_, _events_\n").unwrap();
for (&(ref category, ref meta), ref mut data) in &mut self.buckets {
data.sort_by(|a, b| {
if a < b {
@ -352,11 +352,11 @@ impl Profiler {
data.iter().fold(-f64::INFINITY, |a, &b| a.max(b)));
write!(file, "{}, {}, {:15.4}, {:15.4}, {:15.4}, {:15.4}, {:15}\n",
category.format(&self.output), meta.format(&self.output),
mean, median, min, max, data_len);
mean, median, min, max, data_len).unwrap();
}
}
},
Some(OutputOptions::Stdout(ref period)) => {
Some(OutputOptions::Stdout(_)) => {
let stdout = io::stdout();
let mut lock = stdout.lock();