Skip to content

Commit fb230ed

Browse files
author
Kyle Strand
committed
Minor rewording
1 parent 67b3798 commit fb230ed

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

rfcs/0000-c-unwind-abi.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,11 +393,12 @@ the new `"C unwind"` ABI.
393393
[nightly-attributes]: #attributes-on-nightly-rust-and-prior-rfcs
394394

395395
Currently, nightly Rust provides attributes, `#[unwind(allowed)]` and
396-
`#[unwind(abort)]`, for making the behavior of `panic` crossing a `"C"` ABI
397-
boundary well defined. Two previous RFCs, [#2699][rfc-2699] and
398-
[#2753][rfc-2753], attempted to stabilize these or similar attributes.
396+
`#[unwind(abort)]`, that permit users to select a well-defined behavior when a
397+
`panic` reaches an `extern "C"` function boundary. Two previous RFCs,
398+
[#2699][rfc-2699] and [#2753][rfc-2753], attempted to stabilize these or
399+
similar attributes.
399400

400-
The attribute approach was deemed insufficient:
401+
The attribute approach was deemed insufficient for the following reasons:
401402

402403
* Currently, Rust does not support attributes on function pointers. This may
403404
change in the future, but until then, attributes cannot provide any way to
@@ -413,8 +414,8 @@ The attribute approach was deemed insufficient:
413414
* The ability of a function to unwind must be part of the type system to ensure
414415
that callers that cannot unwind don't invoke functions that can unwind.
415416
Although attributes are sometimes part of a function's type, a function's ABI
416-
string is always part of its type, so we are not introducing anything new to
417-
the type system.
417+
string is always part of its type, so we are not introducing any new elements
418+
to the type system.
418419

419420
[rfc-2699]: https://github.com/rust-lang/rfcs/pull/2699
420421
[rfc-2753]: https://github.com/rust-lang/rfcs/pull/2753

0 commit comments

Comments
 (0)