Skip to content

Rollup of 5 pull requests #68351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 21 commits into from
Jan 18, 2020
Merged

Rollup of 5 pull requests #68351

Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1bf9f69
Prevent urls in headings
GuillaumeGomez Jan 14, 2020
0e6a941
Don't keep link title either, text is generated outside of the link tag
GuillaumeGomez Jan 16, 2020
5022dd3
Extend url in titles test
GuillaumeGomez Jan 16, 2020
298e8ad
Extend url in heading test a bit
GuillaumeGomez Jan 17, 2020
af6282f
Fix table of syscalls in docs of std::time::Instant.
m-ou-se Jan 18, 2020
366f619
Fix table of syscalls in docs of std::time::SystemTime.
m-ou-se Jan 18, 2020
6b7f3e5
improve type_name_of_val docs
lcnr Jan 18, 2020
9746b05
clean up e0200 explanation
GuillaumeGomez Jan 18, 2020
c41443a
stabilize slice_patterns
Centril Dec 29, 2019
0aebb08
slice_patterns: adjust error codes
Centril Dec 29, 2019
3ccb0f9
slice_patterns: remove internal uses of gate
Centril Dec 29, 2019
3e3cac0
slice_patterns: remove feature gate test
Centril Dec 29, 2019
a1eadca
slice_patterns: remove gates in tests
Centril Dec 30, 2019
e3c2f8f
slice_patterns: organize some tests
Centril Dec 30, 2019
120e98c
slice_patterns: remove from unstable book
Centril Dec 30, 2019
57b6843
slice_patterns: address review comments
Centril Jan 2, 2020
733c7f4
Rollup merge of #67712 - Centril:stabilize-slice_patterns, r=matthewj…
Centril Jan 18, 2020
36e58ea
Rollup merge of #68224 - GuillaumeGomez:prevent-urls-in-headings, r=o…
Centril Jan 18, 2020
2a12ef8
Rollup merge of #68340 - GuillaumeGomez:clean-up-e0200, r=Dylan-DPC
Centril Jan 18, 2020
6c94ceb
Rollup merge of #68341 - fusion-engineering-forks:instant-docs, r=Dyl…
Centril Jan 18, 2020
e8819b6
Rollup merge of #68342 - lcnr:type_name_docs, r=Dylan-DPC
Centril Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/libstd/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ pub use core::time::Duration;
///
/// | Platform | System call |
/// |:---------:|:--------------------------------------------------------------------:|
/// | Cloud ABI | [clock_time_get (Monotonic Clock)] |
/// | CloudABI | [clock_time_get (Monotonic Clock)] |
/// | SGX | [`insecure_time` usercall]. More information on [timekeeping in SGX] |
/// | UNIX | [clock_gettime (Monotonic Clock)] |
/// | Darwin | [mach_absolute_time] |
Expand All @@ -79,7 +79,7 @@ pub use core::time::Duration;
/// [__wasi_clock_time_get (Monotonic Clock)]: https://github.com/CraneStation/wasmtime/blob/master/docs/WASI-api.md#clock_time_get
/// [clock_gettime (Monotonic Clock)]: https://linux.die.net/man/3/clock_gettime
/// [mach_absolute_time]: https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/KernelProgramming/services/services.html
/// [clock_time_get (Monotonic Clock)]: https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt
/// [clock_time_get (Monotonic Clock)]: https://nuxi.nl/cloudabi/#clock_time_get
///
/// **Disclaimer:** These system calls might change over time.
///
Expand Down Expand Up @@ -144,15 +144,15 @@ pub struct Instant(time::Instant);
///
/// | Platform | System call |
/// |:---------:|:--------------------------------------------------------------------:|
/// | Cloud ABI | [clock_time_get (Realtime Clock)] |
/// | CloudABI | [clock_time_get (Realtime Clock)] |
/// | SGX | [`insecure_time` usercall]. More information on [timekeeping in SGX] |
/// | UNIX | [clock_gettime (Realtime Clock)] |
/// | DARWIN | [gettimeofday] |
/// | VXWorks | [clock_gettime (Realtime Clock)] |
/// | WASI | [__wasi_clock_time_get (Realtime Clock)] |
/// | Windows | [GetSystemTimeAsFileTime] |
///
/// [clock_time_get (Realtime Clock)]: https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt
/// [clock_time_get (Realtime Clock)]: https://nuxi.nl/cloudabi/#clock_time_get
/// [`insecure_time` usercall]: https://edp.fortanix.com/docs/api/fortanix_sgx_abi/struct.Usercalls.html#method.insecure_time
/// [timekeeping in SGX]: https://edp.fortanix.com/docs/concepts/rust-std/#codestdtimecode
/// [gettimeofday]: http://man7.org/linux/man-pages/man2/gettimeofday.2.html
Expand Down