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

Auto merge of #12431 - ice9js:fix/remove-unwrap-calls, r=Wafflespeanut

Browse source 
Remove unnecessary 'unwrap' calls from ImageCacheThread

Fixes #12390.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12390 (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because the build provides enough verification for the changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12431)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-13 03:06:08 -07:00 • committed by GitHub
commit d9c9d8d1e3
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,
responder: Option<ImageResponder>) {
let msg = ImageCacheCommand::RequestImage(url, result_chan, responder);
self.chan.send(msg).unwrap();
let _ = self.chan.send(msg);
}
/// Asynchronously request an image and metadata.
@ -139,7 +139,7 @@ impl ImageCacheThread {
result_chan: ImageCacheChan,
responder: Option<ImageResponder>) {
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.
@ -147,8 +147,8 @@ impl ImageCacheThread {
-> Result<Arc<Image>, ImageState> {
let (sender, receiver) = ipc::channel().unwrap();
let msg = ImageCacheCommand::GetImageIfAvailable(url, use_placeholder, sender);
self.chan.send(msg).unwrap();
receiver.recv().unwrap()
let _ = self.chan.send(msg);
try!(receiver.recv().map_err(|_| ImageState::LoadError))
}
/// Get the current state of an image, returning its metadata if available.
@ -157,8 +157,8 @@ impl ImageCacheThread {
-> Result<ImageOrMetadataAvailable, ImageState> {
let (sender, receiver) = ipc::channel().unwrap();
let msg = ImageCacheCommand::GetImageOrMetadataIfAvailable(url, use_placeholder, sender);
self.chan.send(msg).unwrap();
receiver.recv().unwrap()
let _ = self.chan.send(msg);
try!(receiver.recv().map_err(|_| ImageState::LoadError))
}
/// Decode the given image bytes and cache the result for the given URL.
@ -166,13 +166,13 @@ impl ImageCacheThread {
url: Url,
image_data: Vec<u8>) {
let msg = ImageCacheCommand::StoreDecodeImage(url, image_data);
self.chan.send(msg).unwrap();
let _ = self.chan.send(msg);
}
/// Shutdown the image cache thread.
pub fn exit(&self) {
let (response_chan, response_port) = ipc::channel().unwrap();
self.chan.send(ImageCacheCommand::Exit(response_chan)).unwrap();
response_port.recv().unwrap();
let _ = self.chan.send(ImageCacheCommand::Exit(response_chan));
let _ = response_port.recv();
}
}