Use expect calls to investigate #12540 and #12288

servo · Aug 8, 2016 · dc3c469 · dc3c469
1 parent 7ed9134
commit dc3c469
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs
@@ -423,10 +423,13 @@ impl FontCacheThread {
 
     pub fn find_font_template(&self, family: FontFamily, desc: FontTemplateDescriptor)
                                                 -> Option<FontTemplateInfo> {
-        let (response_chan, response_port) = ipc::channel().unwrap();
-        self.chan.send(Command::GetFontTemplate(family, desc, response_chan)).unwrap();
+        let (response_chan, response_port) =
+            ipc::channel().expect("failed to create IPC channel");
+        self.chan.send(Command::GetFontTemplate(family, desc, response_chan))
+            .expect("failed to send message to font cache thread");
 
-        let reply = response_port.recv().unwrap();
+        let reply = response_port.recv()
+            .expect("failed to receive response to font request");
 
         match reply {
             Reply::GetFontTemplateReply(data) => {
@@ -437,10 +440,13 @@ impl FontCacheThread {
 
     pub fn last_resort_font_template(&self, desc: FontTemplateDescriptor)
                                                 -> FontTemplateInfo {
-        let (response_chan, response_port) = ipc::channel().unwrap();
-        self.chan.send(Command::GetLastResortFontTemplate(desc, response_chan)).unwrap();
+        let (response_chan, response_port) =
+            ipc::channel().expect("failed to create IPC channel");
+        self.chan.send(Command::GetLastResortFontTemplate(desc, response_chan))
+            .expect("failed to send message to font cache thread");
 
-        let reply = response_port.recv().unwrap();
+        let reply = response_port.recv()
+            .expect("failed to receive response to font request");
 
         match reply {
             Reply::GetFontTemplateReply(data) => {