Skip to content

Commit 33a16de

Browse files
committed
Apply suggestions from RalfJung
1 parent 218bca3 commit 33a16de

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/destructors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ let x = (&temp()).use_temp(); // ERROR
426426
r[destructors.forget]
427427
## Not running destructors
428428

429-
r[destructors.manually-preventing]
430-
### Manually preventing destructors
429+
r[destructors.manually-suppressing]
430+
### Manually suppressing destructors
431431

432432
[`std::mem::forget`] can be used to prevent the destructor of a variable from being run,
433433
and [`std::mem::ManuallyDrop`] provides a wrapper to prevent a

src/linkage.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,11 @@ Passing `rlib`s directly into your foreign linker is currently unsupported.
278278
r[link.unwinding]
279279
### Prohibited linkage and unwinding
280280

281-
r[link.unwinding.consistency]
281+
r[link.unwinding.intro]
282282
If you are *not* using `rustc` to link Rust files, you must take care to ensure that unwinding is
283-
handled consistently across the entire binary. This includes using `dlopen` or similar facilities
284-
where linking is done by the system runtime without `rustc` being involved.
283+
handled consistently across the entire binary. Linking without `rustc` includes using `dlopen` or similar facilities
284+
where linking is done by the system runtime without `rustc` being involved. In the following,
285+
we define what exactly is meant by "handling unwinding consistently".
285286

286287
r[link.unwinding.potential]
287288
A Rust artifact is called *potentially unwinding* if any of the following conditions is met:

0 commit comments

Comments
 (0)