Skip to content

Commit 6ac34fc

Browse files
committed
rephrasing and grammar
1 parent 7072f83 commit 6ac34fc

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

library/std/src/thread/functions.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ pub fn yield_now() {
170170

171171
/// Determines whether the current thread panicking.
172172
///
173-
/// Note that this returns `true` when thread is unwinding due to panic,
174-
/// as well as when a panic hook is executing and program is configured to abort
175-
/// on panic (`panic=abort`)
173+
/// Note that this returns `true` both when the thread is unwinding due to a
174+
/// panic or executing a panic hook. The latter case will still happen when
175+
/// `panic=abort` is set.
176176
///
177177
/// A common use of this feature is to poison shared resources when writing
178178
/// unsafe code, by checking `panicking` when the `drop` is called.
@@ -313,14 +313,14 @@ pub fn sleep(dur: Duration) {
313313
///
314314
/// | Platform | System call |
315315
/// |-----------|----------------------------------------------------------------------|
316-
/// | Linux | [clock_nanosleep] (Monotonic clock) |
316+
/// | Linux | [clock_nanosleep] (Monotonic Clock) |
317317
/// | BSD except OpenBSD | [clock_nanosleep] (Monotonic Clock) |
318-
/// | Android | [clock_nanosleep] (Monotonic Clock)] |
319-
/// | Solaris | [clock_nanosleep] (Monotonic Clock)] |
320-
/// | Illumos | [clock_nanosleep] (Monotonic Clock)] |
321-
/// | Dragonfly | [clock_nanosleep] (Monotonic Clock)] |
322-
/// | Hurd | [clock_nanosleep] (Monotonic Clock)] |
323-
/// | Vxworks | [clock_nanosleep] (Monotonic Clock)] |
318+
/// | Android | [clock_nanosleep] (Monotonic Clock) |
319+
/// | Solaris | [clock_nanosleep] (Monotonic Clock) |
320+
/// | Illumos | [clock_nanosleep] (Monotonic Clock) |
321+
/// | Dragonfly | [clock_nanosleep] (Monotonic Clock) |
322+
/// | Hurd | [clock_nanosleep] (Monotonic Clock) |
323+
/// | Vxworks | [clock_nanosleep] (Monotonic Clock) |
324324
/// | Apple | `mach_wait_until` |
325325
/// | Other | `sleep_until` uses [`sleep`] and does not issue a syscall itself |
326326
///

0 commit comments

Comments
 (0)