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 -->
This commit is contained in:
bors-servo 2016-07-06 15:49:18 -07:00 committed by GitHub
commit 921f605c05
3 changed files with 4 additions and 10 deletions

View file

@ -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)]

View file

@ -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)]