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

add unwrap to send/recv calls

Browse source
This commit is contained in:
Alexandru Cojocaru 2015-01-29 22:11:03 +01:00 • committed by Ms2ger
parent 3da41c2b16
commit 685fee02a0
30 changed files with 100 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/gfx/font_cache_task.rs
View file

@ -120,11 +120,11 @@ impl FontCache {
Command::GetFontTemplate(family, descriptor, result) => {
let family = LowercaseString::new(family.as_slice());
let maybe_font_template = self.get_font_template(&family, &descriptor);
result.send(Reply::GetFontTemplateReply(maybe_font_template));
result.send(Reply::GetFontTemplateReply(maybe_font_template)).unwrap();
}
Command::GetLastResortFontTemplate(descriptor, result) => {
let font_template = self.get_last_resort_font_template(&descriptor);
result.send(Reply::GetFontTemplateReply(Some(font_template)));
result.send(Reply::GetFontTemplateReply(Some(font_template))).unwrap();
}
Command::AddWebFont(family_name, src, result) => {
let family_name = LowercaseString::new(family_name.as_slice());
@ -154,10 +154,10 @@ impl FontCache {
});
}
}
result.send(());
result.send(()).unwrap();
}
Command::Exit(result) => {
result.send(());
result.send(()).unwrap();
break;
}
}
@ -289,7 +289,7 @@ impl FontCacheTask {
-> Option<Arc<FontTemplateData>> {
let (response_chan, response_port) = channel();
self.chan.send(Command::GetFontTemplate(family, desc, response_chan));
self.chan.send(Command::GetFontTemplate(family, desc, response_chan)).unwrap();
let reply = response_port.recv().unwrap();
@ -304,7 +304,7 @@ impl FontCacheTask {
-> Arc<FontTemplateData> {
let (response_chan, response_port) = channel();
self.chan.send(Command::GetLastResortFontTemplate(desc, response_chan));
self.chan.send(Command::GetLastResortFontTemplate(desc, response_chan)).unwrap();
let reply = response_port.recv().unwrap();
@ -317,13 +317,13 @@ impl FontCacheTask {
pub fn add_web_font(&self, family: String, src: Source) {
let (response_chan, response_port) = channel();
self.chan.send(Command::AddWebFont(family, src, response_chan));
response_port.recv();
self.chan.send(Command::AddWebFont(family, src, response_chan)).unwrap();
response_port.recv().unwrap();
}
pub fn exit(&self) {
let (response_chan, response_port) = channel();
self.chan.send(Command::Exit(response_chan));
response_port.recv();
self.chan.send(Command::Exit(response_chan)).unwrap();
response_port.recv().unwrap();
}
}

6
components/gfx/paint_task.rs
View file

@ -186,7 +186,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send {
}
debug!("paint_task: shutdown_chan send");
shutdown_chan.send(());
shutdown_chan.send(()).unwrap();
}, ConstellationMsg::Failure(failure_msg), c);
}
@ -203,7 +203,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send {
if !self.paint_permission {
debug!("PaintTask: paint ready msg");
let ConstellationChan(ref mut c) = self.constellation_chan;
c.send(ConstellationMsg::PainterReady(self.id));
c.send(ConstellationMsg::PainterReady(self.id)).unwrap();
continue;
}
@ -214,7 +214,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send {
if !self.paint_permission {
debug!("PaintTask: paint ready msg");
let ConstellationChan(ref mut c) = self.constellation_chan;
c.send(ConstellationMsg::PainterReady(self.id));
c.send(ConstellationMsg::PainterReady(self.id)).unwrap();
self.compositor.paint_msg_discarded();
continue;
}