Skip to content

Commit

Permalink
Rollup merge of rust-lang#64198 - cramertj:fuchsia-monotonic, r=alexc…
Browse files Browse the repository at this point in the history
…richton

Add Fuchsia to actually_monotonic

Fuchsia provides a fully monotonic clock.

Fix rust-lang#64196

cc @joshlf @tmandry

r? @alexcrichton
  • Loading branch information
Mark-Simulacrum authored Sep 6, 2019
2 parents d909170 + bb1e425 commit 16ee07e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/libstd/sys/unix/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ mod inner {
pub fn actually_monotonic() -> bool {
(cfg!(target_os = "linux") && cfg!(target_arch = "x86_64")) ||
(cfg!(target_os = "linux") && cfg!(target_arch = "x86")) ||
cfg!(target_os = "fuchsia") ||
false // last clause, used so `||` is always trailing above
}

Expand Down

0 comments on commit 16ee07e

Please sign in to comment.