diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-16 04:03:41 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-16 04:03:41 +0530 |
commit | ccfd768c4bd6874c67f1c45c23d770f617452a07 (patch) | |
tree | 540293b4ae59704d4bb63c30042578b0a4af99b4 /components/util/lib.rs | |
parent | f736d8a261b0291f66100f1f3cd84f80936a2e03 (diff) | |
parent | f02fd6330fb0f802f96a346f8bede889afd327f1 (diff) | |
download | servo-ccfd768c4bd6874c67f1c45c23d770f617452a07.tar.gz servo-ccfd768c4bd6874c67f1c45c23d770f617452a07.zip |
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 -->
Diffstat (limited to 'components/util/lib.rs')
-rw-r--r-- | components/util/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/util/lib.rs b/components/util/lib.rs index 4f69d82ed87..5eb530f1b19 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -6,6 +6,7 @@ #![feature(core_intrinsics)] #![feature(custom_derive)] #![cfg_attr(feature = "non-geckolib", feature(decode_utf16))] +#![feature(fnbox)] #![feature(optin_builtin_traits)] #![feature(plugin)] #![feature(panic_handler)] @@ -53,6 +54,7 @@ pub mod linked_list; pub mod non_geckolib; #[allow(unsafe_code)] pub mod opts; +pub mod panicking; #[allow(unsafe_code)] pub mod prefs; pub mod print_tree; |