Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
flba-eb committed Oct 6, 2022
1 parent 5650346 commit 9a97cc8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions library/std/src/panicking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@ pub mod panic_count {
// records whether panic::always_abort() has been called. This can only be
// set, never cleared.
// panic::always_abort() is usually called to prevent memory allocations done by
// the panic handling in the child created by `libc::fork`.
// the panic handling in the child created by `libc::fork`.
// Memory allocations performed in a child created with `libc::fork` are undefined
// behavior in most operating systems.
// Accessing LOCAL_PANIC_COUNT in a child created by `libc::fork` would lead to a memory
// Accessing LOCAL_PANIC_COUNT in a child created by `libc::fork` would lead to a memory
// allocation. Only GLOBAL_PANIC_COUNT can be accessed in this situation. This is
// sufficient because a child process will always have exactly one thread only.
// See also #85261 for details.
Expand Down
4 changes: 3 additions & 1 deletion src/test/ui/process/process-panic-after-fork.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ fn expect_aborted(status: ExitStatus) {
// If the next assert fails sporadically we might have an issue with parallel crashing apps
assert!(tombstone
.contains(&std::env::current_exe().unwrap().into_os_string().into_string().unwrap()));
assert!(tombstone.contains("signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr deadbaad"));
assert!(tombstone.contains(
"signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr deadbaad"
));
}
}

Expand Down

0 comments on commit 9a97cc8

Please sign in to comment.