Auto merge of #10572 - Manishearth:and-now-his-watch-is-ended, r=asajeffrey

Replace watcher threads with panic handlers

<!-- 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/10572)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-16 04:03:41 +05:30
commit ccfd768c4b
5 changed files with 116 additions and 54 deletions

View file

@ -35,6 +35,7 @@ extern crate servo;
use servo::Browser;
use servo::compositing::windowing::WindowEvent;
use servo::util::opts::{self, ArgumentParsingResult};
use servo::util::panicking::initiate_panic_hook;
use std::rc::Rc;
fn main() {
@ -51,6 +52,7 @@ fn main() {
None
};
initiate_panic_hook();
env_logger::init().unwrap();
setup_logging();