diff options
| author | bors <bors@rust-lang.org> | 2020-01-13 08:20:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-13 08:20:49 +0000 |
| commit | af958046e5855a4254831102b502f57dafa40f69 (patch) | |
| tree | 731b779310aa28b33dc1108624e9d96e60db1c64 /src/libstd | |
| parent | e82febc78e5a14356de5f713b904eebef1e86956 (diff) | |
| parent | 87bdc8eb73b5dd48f58bca00b307cbca1351b2f9 (diff) | |
Auto merge of #68174 - JohnTitor:rollup-ix4amrj, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #67313 (Document more use cases of dataflow) - #67959 (rustdoc: improve stability mark arrows) - #68097 (Specify units for test timeout environment variables) - #68135 (restore some rustc_parse visibilities for rustfmt) - #68145 (Expose `context::CheckLintNameResult`) - #68156 (Fix crate paths in comments) - #68157 (Clean up E0186 explanation) - #68161 (Fix system call docs for time::Instant) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/time.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/time.rs b/src/libstd/time.rs index 0dce8f810eb..0b6e728dceb 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -67,7 +67,7 @@ pub use core::time::Duration; /// |:---------:|:--------------------------------------------------------------------:| /// | Cloud ABI | [clock_time_get (Monotonic Clock)] | /// | SGX | [`insecure_time` usercall]. More information on [timekeeping in SGX] | -/// | UNIX | [clock_time_get (Monotonic Clock)] | +/// | UNIX | [clock_gettime (Monotonic Clock)] | /// | Darwin | [mach_absolute_time] | /// | VXWorks | [clock_gettime (Monotonic Clock)] | /// | WASI | [__wasi_clock_time_get (Monotonic Clock)] | |