Skip to content

Commit a35dac2

Browse files
authored
Rollup merge of rust-lang#58128 - taiki-e:libunwind-2018, r=Centril
libunwind => 2018 Transitions `libunwind` to Rust 2018; cc rust-lang#58099 r? @Centril
2 parents 3dbdd69 + 5440149 commit a35dac2

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/libunwind/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ authors = ["The Rust Project Developers"]
33
name = "unwind"
44
version = "0.0.0"
55
build = "build.rs"
6+
edition = "2018"
67

78
[lib]
89
name = "unwind"

src/libunwind/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#![no_std]
22
#![unstable(feature = "panic_unwind", issue = "32837")]
33

4+
#![deny(rust_2018_idioms)]
5+
46
#![feature(link_cfg)]
5-
#![feature(nll)]
67
#![feature(staged_api)]
78
#![feature(unwind_attributes)]
89
#![feature(static_nobundle)]
@@ -18,7 +19,6 @@ cfg_if! {
1819
} else if #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))] {
1920
// no unwinder on the system!
2021
} else {
21-
extern crate libc;
2222
mod libunwind;
2323
pub use libunwind::*;
2424
}

src/libunwind/libunwind.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub enum _Unwind_Reason_Code {
2121
_URC_CONTINUE_UNWIND = 8,
2222
_URC_FAILURE = 9, // used only by ARM EHABI
2323
}
24-
pub use self::_Unwind_Reason_Code::*;
24+
pub use _Unwind_Reason_Code::*;
2525

2626
pub type _Unwind_Exception_Class = u64;
2727
pub type _Unwind_Word = uintptr_t;
@@ -94,7 +94,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
9494
_UA_FORCE_UNWIND = 8,
9595
_UA_END_OF_STACK = 16,
9696
}
97-
pub use self::_Unwind_Action::*;
97+
pub use _Unwind_Action::*;
9898

9999
extern "C" {
100100
pub fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word;
@@ -118,7 +118,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
118118
_US_FORCE_UNWIND = 8,
119119
_US_END_OF_STACK = 16,
120120
}
121-
pub use self::_Unwind_State::*;
121+
pub use _Unwind_State::*;
122122

123123
#[repr(C)]
124124
enum _Unwind_VRS_Result {
@@ -134,7 +134,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
134134
_UVRSC_WMMXD = 3,
135135
_UVRSC_WMMXC = 4,
136136
}
137-
use self::_Unwind_VRS_RegClass::*;
137+
use _Unwind_VRS_RegClass::*;
138138
#[repr(C)]
139139
enum _Unwind_VRS_DataRepresentation {
140140
_UVRSD_UINT32 = 0,
@@ -144,7 +144,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
144144
_UVRSD_FLOAT = 4,
145145
_UVRSD_DOUBLE = 5,
146146
}
147-
use self::_Unwind_VRS_DataRepresentation::*;
147+
use _Unwind_VRS_DataRepresentation::*;
148148

149149
pub const UNWIND_POINTER_REG: c_int = 12;
150150
pub const UNWIND_IP_REG: c_int = 15;

0 commit comments

Comments
 (0)