Skip to content

Commit

Permalink
Auto merge of #11166 - emilio:fontcache-exit, r=mbrubeck
Browse files Browse the repository at this point in the history
gfx: Add expect messages to FontCacheThread::exit()

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
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they only add debug info.

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

One of these two unwraps is the one that is causing most occurrences
of #8815.

I'd go with removing the second unwrap entirely, but let's get some
debug info first, since it might probably be a race.

<!-- 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/11166)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed May 12, 2016
2 parents 1e8ddba + f6434a9 commit 2e049a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/gfx/font_cache_thread.rs
Expand Up @@ -438,8 +438,8 @@ impl FontCacheThread {

pub fn exit(&self) {
let (response_chan, response_port) = ipc::channel().unwrap();
self.chan.send(Command::Exit(response_chan)).unwrap();
response_port.recv().unwrap();
self.chan.send(Command::Exit(response_chan)).expect("Couldn't send FontCacheThread exit message");
response_port.recv().expect("Couldn't receive FontCacheThread reply");
}
}

Expand Down

0 comments on commit 2e049a8

Please sign in to comment.