bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix whitespace

Browse source
This commit is contained in:
Florian Bartels 2022-10-06 08:52:36 +02:00
parent 56503460c8
commit 9a97cc8ca5
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/std/src/panicking.rs
View file

@ -309,10 +309,10 @@ pub mod panic_count {
// records whether panic::always_abort() has been called. This can only be // records whether panic::always_abort() has been called. This can only be
// set, never cleared. // set, never cleared.
// panic::always_abort() is usually called to prevent memory allocations done by // 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 // Memory allocations performed in a child created with `libc::fork` are undefined
// behavior in most operating systems. // 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 // 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. // sufficient because a child process will always have exactly one thread only.
// See also #85261 for details. // See also #85261 for details.

4
src/test/ui/process/process-panic-after-fork.rs
View file

@ -99,7 +99,9 @@ fn expect_aborted(status: ExitStatus) {
// If the next assert fails sporadically we might have an issue with parallel crashing apps // If the next assert fails sporadically we might have an issue with parallel crashing apps
assert!(tombstone assert!(tombstone
.contains(&std::env::current_exe().unwrap().into_os_string().into_string().unwrap())); .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"
));
} }
} }