diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-06 15:49:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 15:49:18 -0700 |
| commit | 921f605c0528b087db627f02c94fb71849a40b1c (patch) | |
| tree | abf6124412dec8dc38e83c8a63387642b0bd8407 /components | |
| parent | 7da28b7ca63c7b4538aa1b81b7ad1182415c32f2 (diff) | |
| parent | 5f2d5ef74861b05480bd18fc0d65e19d435b2736 (diff) | |
| download | servo-921f605c0528b087db627f02c94fb71849a40b1c.tar.gz servo-921f605c0528b087db627f02c94fb71849a40b1c.zip | |
Auto merge of #12287 - nox:die-util-die, r=KiChjang
Remove util::breakpoint
<!-- 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/12287)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/dom/window.rs | 5 | ||||
| -rw-r--r-- | components/script/lib.rs | 2 | ||||
| -rw-r--r-- | components/util/lib.rs | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index a098edcb43c..34ac683e233 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -96,8 +96,8 @@ use timers::{IsInterval, OneshotTimerCallback, OneshotTimerHandle, OneshotTimers use tinyfiledialogs::{self, MessageBoxIcon}; use url::Url; use util::geometry::{self, MAX_RECT}; +use util::opts; use util::prefs::PREFS; -use util::{breakpoint, opts}; use webdriver_handlers::jsval_to_webdriver; /// Current state of the window object @@ -669,8 +669,9 @@ impl WindowMethods for Window { } } + #[allow(unsafe_code)] fn Trap(&self) { - breakpoint(); + unsafe { ::std::intrinsics::breakpoint() } } #[allow(unsafe_code)] diff --git a/components/script/lib.rs b/components/script/lib.rs index 4f66095e1ff..ebc5b4a1686 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -6,7 +6,7 @@ #![feature(borrow_state)] #![feature(box_syntax)] #![feature(const_fn)] -#![cfg_attr(debug_assertions, feature(core_intrinsics))] +#![feature(core_intrinsics)] #![feature(custom_attribute)] #![feature(custom_derive)] #![feature(fnbox)] diff --git a/components/util/lib.rs b/components/util/lib.rs index 15fdaa5f332..6ffa4a4a2b5 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![cfg_attr(feature = "servo", feature(core_intrinsics))] #![cfg_attr(feature = "servo", feature(custom_derive))] #![cfg_attr(feature = "servo", feature(fnbox))] #![cfg_attr(feature = "servo", feature(plugin))] @@ -41,12 +40,6 @@ pub mod resource_files; pub mod thread; pub mod thread_state; -#[cfg(feature = "servo")] -#[allow(unsafe_code)] -pub fn breakpoint() { - unsafe { ::std::intrinsics::breakpoint() }; -} - // Workaround for lack of `ptr_eq` on Arcs... #[inline] pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool { |