diff options
| author | bors <bors@rust-lang.org> | 2024-02-23 16:26:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-23 16:26:49 +0000 |
| commit | 21033f637e60af61ead04cc296e7214f89c16a95 (patch) | |
| tree | 65892a1b2d86e7c5307c3212c886f11d7177e6e3 /library/std/src | |
| parent | b6a23b853719c8c22c022993c9eb2871b09fc2b9 (diff) | |
| parent | 06e54f8d49dd46f3b7d8e8be1df71d214809c14e (diff) | |
| download | rust-21033f637e60af61ead04cc296e7214f89c16a95.tar.gz rust-21033f637e60af61ead04cc296e7214f89c16a95.zip | |
Auto merge of #121514 - matthiaskrgr:rollup-5f0vhv7, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #120742 (mark `min_exhaustive_patterns` as complete) - #121470 (Don't ICE on anonymous struct in enum variant) - #121492 (coverage: Rename `is_closure` to `is_hole`) - #121495 (remove repetitive words) - #121498 (Make QNX/NTO specific "timespec capping" public to crate::sys) - #121510 (lint-overflowing-ops: unify cases and remove redundancy) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/pal/unix/time.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/time.rs b/library/std/src/sys/pal/unix/time.rs index f62eb828ee5..251a37d54dd 100644 --- a/library/std/src/sys/pal/unix/time.rs +++ b/library/std/src/sys/pal/unix/time.rs @@ -10,7 +10,7 @@ pub const TIMESPEC_MAX: libc::timespec = // This additional constant is only used when calling // `libc::pthread_cond_timedwait`. #[cfg(target_os = "nto")] -pub(super) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec { +pub(in crate::sys) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec { tv_sec: (u64::MAX / NSEC_PER_SEC) as i64, tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64, }; @@ -204,7 +204,7 @@ impl Timespec { // On QNX Neutrino, the maximum timespec for e.g. pthread_cond_timedwait // is 2^64 nanoseconds #[cfg(target_os = "nto")] - pub(super) fn to_timespec_capped(&self) -> Option<libc::timespec> { + pub(in crate::sys) fn to_timespec_capped(&self) -> Option<libc::timespec> { // Check if timeout in nanoseconds would fit into an u64 if (self.tv_nsec.0 as u64) .checked_add((self.tv_sec as u64).checked_mul(NSEC_PER_SEC)?) |