Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libunwind => 2018 #58128

Merged
merged 1 commit into from
Feb 5, 2019
Merged

libunwind => 2018 #58128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libunwind/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ authors = ["The Rust Project Developers"]
name = "unwind"
version = "0.0.0"
build = "build.rs"
edition = "2018"

[lib]
name = "unwind"
Expand Down
4 changes: 2 additions & 2 deletions src/libunwind/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#![no_std]
#![unstable(feature = "panic_unwind", issue = "32837")]

#![deny(rust_2018_idioms)]

#![feature(link_cfg)]
#![feature(nll)]
#![feature(staged_api)]
#![feature(unwind_attributes)]
#![feature(static_nobundle)]
Expand All @@ -18,7 +19,6 @@ cfg_if! {
} else if #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))] {
// no unwinder on the system!
} else {
extern crate libc;
mod libunwind;
pub use libunwind::*;
}
Expand Down
10 changes: 5 additions & 5 deletions src/libunwind/libunwind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub enum _Unwind_Reason_Code {
_URC_CONTINUE_UNWIND = 8,
_URC_FAILURE = 9, // used only by ARM EHABI
}
pub use self::_Unwind_Reason_Code::*;
pub use _Unwind_Reason_Code::*;

pub type _Unwind_Exception_Class = u64;
pub type _Unwind_Word = uintptr_t;
Expand Down Expand Up @@ -94,7 +94,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
_UA_FORCE_UNWIND = 8,
_UA_END_OF_STACK = 16,
}
pub use self::_Unwind_Action::*;
pub use _Unwind_Action::*;

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

#[repr(C)]
enum _Unwind_VRS_Result {
Expand All @@ -134,7 +134,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
_UVRSC_WMMXD = 3,
_UVRSC_WMMXC = 4,
}
use self::_Unwind_VRS_RegClass::*;
use _Unwind_VRS_RegClass::*;
#[repr(C)]
enum _Unwind_VRS_DataRepresentation {
_UVRSD_UINT32 = 0,
Expand All @@ -144,7 +144,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
_UVRSD_FLOAT = 4,
_UVRSD_DOUBLE = 5,
}
use self::_Unwind_VRS_DataRepresentation::*;
use _Unwind_VRS_DataRepresentation::*;

pub const UNWIND_POINTER_REG: c_int = 12;
pub const UNWIND_IP_REG: c_int = 15;
Expand Down