M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #258 from paoloteti/fix-ci 

Rename `panic_implementation` -> `panic_handler`
This commit is contained in:
Alex Crichton 2018-09-02 16:28:58 -05:00 committed by GitHub
parent f3a13eb238 50ea70d7d0
commit 5a88717b46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -10,7 +10,7 @@ test = false
cc = { optional = true, version = "1.0" } cc = { optional = true, version = "1.0" }
[dev-dependencies] [dev-dependencies]
panic-implementation = { path = 'crates/panic-implementation' } panic-handler = { path = 'crates/panic-handler' }
[features] [features]
default = ["compiler-builtins"] default = ["compiler-builtins"]

2
crates/panic-implementation/Cargo.toml → crates/panic-handler/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "panic-implementation" name = "panic-handler"
version = "0.1.0" version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]

4
crates/panic-implementation/src/lib.rs → crates/panic-handler/src/lib.rs
View File

@ -1,11 +1,11 @@
// Hack of a crate until rust-lang/rust#51647 is fixed // Hack of a crate until rust-lang/rust#51647 is fixed
#![feature(no_core, panic_implementation)] #![feature(no_core, panic_handler)]
#![no_core] #![no_core]
extern crate core; extern crate core;
#[panic_implementation] #[panic_handler]
fn panic(_: &core::panic::PanicInfo) -> ! { fn panic(_: &core::panic::PanicInfo) -> ! {
loop {} loop {}
} }

4
examples/intrinsics.rs
View File

@ -11,11 +11,11 @@
#![feature(lang_items)] #![feature(lang_items)]
#![feature(start)] #![feature(start)]
#![feature(allocator_api)] #![feature(allocator_api)]
#![feature(panic_implementation)] #![feature(panic_handler)]
#![cfg_attr(windows, feature(panic_unwind))] #![cfg_attr(windows, feature(panic_unwind))]
#![no_std] #![no_std]
extern crate panic_implementation; extern crate panic_handler;
#[cfg(not(thumb))] #[cfg(not(thumb))]
#[link(name = "c")] #[link(name = "c")]