Auto merge of #13068 - ashrko619:shut_down_layout_panic, r=jdm

Fixed calling unwrap on an Err value

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #13046  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests.

<!-- 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/13068)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-26 22:06:28 -05:00 committed by GitHub
commit 0ced8cd1f1

View file

@ -2201,7 +2201,7 @@ fn shut_down_layout(context_tree: &BrowsingContext) {
let chan = window.layout_chan().clone();
if chan.send(message::Msg::PrepareToExit(response_chan)).is_ok() {
channels.push(chan);
response_port.recv().unwrap();
let _ = response_port.recv();
}
}