Skip to content

Commit 142c0bd

Browse files
committed
Auto merge of rust-lang#106075 - nbdd0121:ffi-unwind, r=joshtriplett
Partial stabilisation of `c_unwind` The stabilisation report is at rust-lang#74990 (comment) cc `@rust-lang/wg-ffi-unwind`
2 parents 7534c2b + 3a97399 commit 142c0bd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

panic_unwind/src/emcc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static EXCEPTION_TYPE_INFO: TypeInfo = TypeInfo {
4747
name: b"rust_panic\0".as_ptr(),
4848
};
4949

50-
// NOTE(nbdd0121): The `canary` field will be part of stable ABI after `c_unwind` stabilization.
50+
// NOTE(nbdd0121): The `canary` field is part of stable ABI.
5151
#[repr(C)]
5252
struct Exception {
5353
// See `gcc.rs` on why this is present. We already have a static here so just use it.

panic_unwind/src/gcc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ use unwind as uw;
4848
static CANARY: u8 = 0;
4949

5050
// NOTE(nbdd0121)
51-
// Once `c_unwind` feature is stabilized, there will be ABI stability requirement
52-
// on this struct. The first two field must be `_Unwind_Exception` and `canary`,
51+
// There is an ABI stability requirement on this struct.
52+
// The first two field must be `_Unwind_Exception` and `canary`,
5353
// as it may be accessed by a different version of the std with a different compiler.
5454
#[repr(C)]
5555
struct Exception {

panic_unwind/src/seh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use core::mem::{self, ManuallyDrop};
5252
use core::ptr;
5353
use libc::{c_int, c_uint, c_void};
5454

55-
// NOTE(nbdd0121): The `canary` field will be part of stable ABI after `c_unwind` stabilization.
55+
// NOTE(nbdd0121): The `canary` field is part of stable ABI.
5656
#[repr(C)]
5757
struct Exception {
5858
// See `gcc.rs` on why this is present. We already have a static here so just use it.

0 commit comments

Comments
 (0)