Rollup merge of #58112 - Centril:libpanic_abort-2018, r=oli-obk

libpanic_abort => 2018

Transitions `libpanic_abort` to Rust 2018; cc #58099

r? @oli-obk
This commit is contained in:
kennytm 2019-02-06 00:28:57 +09:00 committed by GitHub
commit c4af395cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -2,6 +2,7 @@
authors = ["The Rust Project Developers"]
name = "panic_abort"
version = "0.0.0"
edition = "2018"
[lib]
path = "lib.rs"

View File

@ -10,11 +10,12 @@
html_root_url = "https://doc.rust-lang.org/nightly/",
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
#![panic_runtime]
#![allow(unused_features)]
#![deny(rust_2018_idioms)]
#![feature(core_intrinsics)]
#![feature(libc)]
#![feature(nll)]
#![feature(panic_runtime)]
#![feature(staged_api)]
#![feature(rustc_attrs)]
@ -46,7 +47,6 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 {
#[cfg(any(unix, target_os = "cloudabi"))]
unsafe fn abort() -> ! {
extern crate libc;
libc::abort();
}