Skip to content

Commit e7e6dec

Browse files
pnkfelixCentrilRalfJung
authored
Apply suggestions from code review
Co-Authored-By: Mazdak Farrokhzad <[email protected]> Co-Authored-By: Ralf Jung <[email protected]>
1 parent 3adcc3e commit e7e6dec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/librustc_codegen_llvm/attributes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ pub fn from_fn_attrs(
281281
//
282282
// However, in the long term we should either:
283283
// - fold this into final else (i.e. stop inspecting `id`)
284-
// - or better still: whole-heartedly adopt Rust PR #63909.
284+
// - adopt Rust PR #63909.
285285
//
286286
// see also Rust RFC 2753.
287287

@@ -294,7 +294,7 @@ pub fn from_fn_attrs(
294294
} else {
295295
// Anything else is either:
296296
//
297-
// 1. A foreign item (like `extern "C" { fn foo(); }`), or
297+
// 1. A foreign item using a non-Rust ABI (like `extern "C" { fn foo(); }`), or
298298
//
299299
// 2. A Rust item using a non-Rust ABI (like `extern "C" fn foo() { ... }`).
300300
//

src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// run-pass
22

33
// rust-lang/rust#64655: with panic=unwind, a panic from a subroutine
4-
// should still run desstructors as it unwindws the stack. However,
4+
// should still run destructors as it unwinds the stack. However,
55
// bugs with how the nounwind LLVM attribute was applied led to this
66
// simple case being mishandled *if* you had fat LTO turned on.
77

@@ -54,7 +54,7 @@ fn main() {
5454

5555
let wait = handle.join();
5656

57-
// reinstate handler to ease observation of assertion failures.
57+
// Reinstate handler to ease observation of assertion failures.
5858
std::panic::set_hook(old_hook);
5959

6060
assert!(wait.is_err());

src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// run-pass
22

33
// rust-lang/rust#64655: with panic=unwind, a panic from a subroutine
4-
// should still run desstructors as it unwinds the stack. However,
4+
// should still run destructors as it unwinds the stack. However,
55
// bugs with how the nounwind LLVM attribute was applied led to this
66
// simple case being mishandled *if* you had optimization *and* fat
77
// LTO turned on.
@@ -13,7 +13,7 @@
1313
// This test takes the code from the above issue and adapts it to
1414
// better fit our test infrastructure:
1515
//
16-
// * Instead of relying on println! to observe whether the destructor
16+
// * Instead of relying on `println!` to observe whether the destructor
1717
// is run, we instead run the code in a spawned thread and
1818
// communicate the destructor's operation via a synchronous atomic
1919
// in static memory.

0 commit comments

Comments
 (0)