diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-06 09:36:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 09:36:49 +0200 |
| commit | 61fcd057d2524175a21e2eb1d49c1d4aec29a0be (patch) | |
| tree | 48ea5150538790309c68b9f515c4e958724a82a5 /src/libstd | |
| parent | 9d859b3bca010ae79066843614f8b836379eb643 (diff) | |
| parent | bb1e42599d0062b9a43e83b5486d61eb1fcf0771 (diff) | |
| download | rust-61fcd057d2524175a21e2eb1d49c1d4aec29a0be.tar.gz rust-61fcd057d2524175a21e2eb1d49c1d4aec29a0be.zip | |
Rollup merge of #64198 - cramertj:fuchsia-monotonic, r=alexcrichton
Add Fuchsia to actually_monotonic Fuchsia provides a fully monotonic clock. Fix https://github.com/rust-lang/rust/issues/64196 cc @joshlf @tmandry r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/time.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs index 02f377d55c9..fd6796ad22c 100644 --- a/src/libstd/sys/unix/time.rs +++ b/src/libstd/sys/unix/time.rs @@ -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 } |