From a239419cc0692cec5a9b35de8d3ad472276b8c1a Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Mon, 1 May 2017 13:47:29 -0700
Subject: [PATCH] Replace intrinsics::abort with process::abort

---
 ports/cef/lib.rs    | 1 -
 ports/cef/stubs.rs  | 4 +---
 ports/servo/main.rs | 8 +++-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs
index f953358e4a9..809fccc412b 100644
--- a/ports/cef/lib.rs
+++ b/ports/cef/lib.rs
@@ -4,7 +4,6 @@
 
 #![allow(non_camel_case_types)]
 #![feature(box_syntax)]
-#![feature(core_intrinsics)]
 #![feature(link_args)]
 
 #[macro_use]
diff --git a/ports/cef/stubs.rs b/ports/cef/stubs.rs
index 8f4a9b73820..df35e050852 100644
--- a/ports/cef/stubs.rs
+++ b/ports/cef/stubs.rs
@@ -12,9 +12,7 @@ macro_rules! stub(
         #[allow(non_snake_case)]
         pub extern "C" fn $name() {
             println!("CEF stub function called: {}", stringify!($name));
-            unsafe {
-                ::std::intrinsics::abort()
-            }
+            ::std::process::abort()
         }
     )
 );
diff --git a/ports/servo/main.rs b/ports/servo/main.rs
index dc0ae0329aa..6534aed75c0 100644
--- a/ports/servo/main.rs
+++ b/ports/servo/main.rs
@@ -15,7 +15,7 @@
 //!
 //! [glutin]: https://github.com/tomaka/glutin
 
-#![feature(start, core_intrinsics)]
+#![feature(start)]
 
 #[cfg(target_os = "android")]
 extern crate android_injected_glue;
@@ -58,7 +58,7 @@ pub mod platform {
 fn install_crash_handler() {
     use backtrace::Backtrace;
     use sig::ffi::Sig;
-    use std::intrinsics::abort;
+    use std::process::abort;
     use std::thread;
 
     fn handler(_sig: i32) {
@@ -67,9 +67,7 @@ fn install_crash_handler() {
             .map(|n| format!(" for thread \"{}\"", n))
             .unwrap_or("".to_owned());
         println!("Stack trace{}\n{:?}", name, Backtrace::new());
-        unsafe {
-            abort();
-        }
+        abort();
     }
 
     signal!(Sig::SEGV, handler); // handle segfaults