Skip to content

Commit f5a6b1b

Browse files
authored
Rollup merge of #147503 - stepancheg:instant-now-mac-doc, r=joboet
Fix documentation of Instant::now on mac It is `CLOCK_UPTIME_RAW` on Apple. https://github.com/rust-lang/rust/blob/b6f0945e4681bc4d2faa7c22c5f61dc36abf7dd2/library/std/src/sys/pal/unix/time.rs#L260-L264
2 parents 0765b43 + dff4561 commit f5a6b1b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

library/std/src/time.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,19 @@ use crate::sys_common::{FromInner, IntoInner};
112112
/// | Platform | System call |
113113
/// |-----------|----------------------------------------------------------------------|
114114
/// | SGX | [`insecure_time` usercall]. More information on [timekeeping in SGX] |
115-
/// | UNIX | [clock_gettime (Monotonic Clock)] |
116-
/// | Darwin | [clock_gettime (Monotonic Clock)] |
117-
/// | VXWorks | [clock_gettime (Monotonic Clock)] |
115+
/// | UNIX | [clock_gettime] with `CLOCK_MONOTONIC` |
116+
/// | Darwin | [clock_gettime] with `CLOCK_UPTIME_RAW` |
117+
/// | VXWorks | [clock_gettime] with `CLOCK_MONOTONIC` |
118118
/// | SOLID | `get_tim` |
119-
/// | WASI | [__wasi_clock_time_get (Monotonic Clock)] |
119+
/// | WASI | [__wasi_clock_time_get] with `monotonic` |
120120
/// | Windows | [QueryPerformanceCounter] |
121121
///
122122
/// [currently]: crate::io#platform-specific-behavior
123123
/// [QueryPerformanceCounter]: https://docs.microsoft.com/en-us/windows/win32/api/profileapi/nf-profileapi-queryperformancecounter
124124
/// [`insecure_time` usercall]: https://edp.fortanix.com/docs/api/fortanix_sgx_abi/struct.Usercalls.html#method.insecure_time
125125
/// [timekeeping in SGX]: https://edp.fortanix.com/docs/concepts/rust-std/#codestdtimecode
126-
/// [__wasi_clock_time_get (Monotonic Clock)]: https://github.com/WebAssembly/WASI/blob/main/legacy/preview1/docs.md#clock_time_get
127-
/// [clock_gettime (Monotonic Clock)]: https://linux.die.net/man/3/clock_gettime
126+
/// [__wasi_clock_time_get]: https://github.com/WebAssembly/WASI/blob/main/legacy/preview1/docs.md#clock_time_get
127+
/// [clock_gettime]: https://linux.die.net/man/3/clock_gettime
128128
///
129129
/// **Disclaimer:** These system calls might change over time.
130130
///

0 commit comments

Comments
 (0)