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

Remove unnecessary 'unwrap' calls from ImageCacheThread

Browse source
This commit is contained in:
Kuba Birecki 2016-07-13 09:38:55 +02:00
parent f0c3543f53
commit 1d1467154d
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/net_traits/image_cache_thread.rs
View file

@ -129,7 +129,7 @@ impl ImageCacheThread {
result_chan: ImageCacheChan, result_chan: ImageCacheChan,
responder: Option<ImageResponder>) { responder: Option<ImageResponder>) {
let msg = ImageCacheCommand::RequestImage(url, result_chan, responder); let msg = ImageCacheCommand::RequestImage(url, result_chan, responder);
self.chan.send(msg).unwrap(); let _ = self.chan.send(msg);
} }
/// Asynchronously request an image and metadata. /// Asynchronously request an image and metadata.
@ -139,7 +139,7 @@ impl ImageCacheThread {
result_chan: ImageCacheChan, result_chan: ImageCacheChan,
responder: Option<ImageResponder>) { responder: Option<ImageResponder>) {
let msg = ImageCacheCommand::RequestImageAndMetadata(url, result_chan, responder); let msg = ImageCacheCommand::RequestImageAndMetadata(url, result_chan, responder);
self.chan.send(msg).unwrap(); let _ = self.chan.send(msg);
} }
/// Get the current state of an image. See ImageCacheCommand::GetImageIfAvailable. /// Get the current state of an image. See ImageCacheCommand::GetImageIfAvailable.
@ -147,8 +147,8 @@ impl ImageCacheThread {
-> Result<Arc<Image>, ImageState> { -> Result<Arc<Image>, ImageState> {
let (sender, receiver) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let msg = ImageCacheCommand::GetImageIfAvailable(url, use_placeholder, sender); let msg = ImageCacheCommand::GetImageIfAvailable(url, use_placeholder, sender);
self.chan.send(msg).unwrap(); let _ = self.chan.send(msg);
receiver.recv().unwrap() try!(receiver.recv().map_err(|_| ImageState::LoadError))
} }
/// Get the current state of an image, returning its metadata if available. /// Get the current state of an image, returning its metadata if available.
@ -157,8 +157,8 @@ impl ImageCacheThread {
-> Result<ImageOrMetadataAvailable, ImageState> { -> Result<ImageOrMetadataAvailable, ImageState> {
let (sender, receiver) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let msg = ImageCacheCommand::GetImageOrMetadataIfAvailable(url, use_placeholder, sender); let msg = ImageCacheCommand::GetImageOrMetadataIfAvailable(url, use_placeholder, sender);
self.chan.send(msg).unwrap(); let _ = self.chan.send(msg);
receiver.recv().unwrap() try!(receiver.recv().map_err(|_| ImageState::LoadError))
} }
/// Decode the given image bytes and cache the result for the given URL. /// Decode the given image bytes and cache the result for the given URL.
@ -166,13 +166,13 @@ impl ImageCacheThread {
url: Url, url: Url,
image_data: Vec<u8>) { image_data: Vec<u8>) {
let msg = ImageCacheCommand::StoreDecodeImage(url, image_data); let msg = ImageCacheCommand::StoreDecodeImage(url, image_data);
self.chan.send(msg).unwrap(); let _ = self.chan.send(msg);
} }
/// Shutdown the image cache thread. /// Shutdown the image cache thread.
pub fn exit(&self) { pub fn exit(&self) {
let (response_chan, response_port) = ipc::channel().unwrap(); let (response_chan, response_port) = ipc::channel().unwrap();
self.chan.send(ImageCacheCommand::Exit(response_chan)).unwrap(); let _ = self.chan.send(ImageCacheCommand::Exit(response_chan));
response_port.recv().unwrap(); let _ = response_port.recv();
} }
} }