Skip to content

Commit bd29aa0

Browse files
committed
Auto merge of rust-lang#121514 - matthiaskrgr:rollup-5f0vhv7, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#120742 (mark `min_exhaustive_patterns` as complete) - rust-lang#121470 (Don't ICE on anonymous struct in enum variant) - rust-lang#121492 (coverage: Rename `is_closure` to `is_hole`) - rust-lang#121495 (remove repetitive words) - rust-lang#121498 (Make QNX/NTO specific "timespec capping" public to crate::sys) - rust-lang#121510 (lint-overflowing-ops: unify cases and remove redundancy) r? `@ghost` `@rustbot` modify labels: rollup
2 parents aaa3993 + 2eb9b37 commit bd29aa0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

alloc/src/collections/btree/map.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2916,7 +2916,7 @@ impl<'a, K, V> Cursor<'a, K, V> {
29162916
}
29172917
}
29182918

2919-
/// Returns a reference to the the key and value of the next element without
2919+
/// Returns a reference to the key and value of the next element without
29202920
/// moving the cursor.
29212921
///
29222922
/// If the cursor is at the end of the map then `None` is returned
@@ -2925,7 +2925,7 @@ impl<'a, K, V> Cursor<'a, K, V> {
29252925
self.clone().next()
29262926
}
29272927

2928-
/// Returns a reference to the the key and value of the previous element
2928+
/// Returns a reference to the key and value of the previous element
29292929
/// without moving the cursor.
29302930
///
29312931
/// If the cursor is at the start of the map then `None` is returned.
@@ -2958,7 +2958,7 @@ impl<'a, K, V, A> CursorMut<'a, K, V, A> {
29582958
Some((&*k, v))
29592959
}
29602960

2961-
/// Returns a reference to the the key and value of the next element without
2961+
/// Returns a reference to the key and value of the next element without
29622962
/// moving the cursor.
29632963
///
29642964
/// If the cursor is at the end of the map then `None` is returned
@@ -2968,7 +2968,7 @@ impl<'a, K, V, A> CursorMut<'a, K, V, A> {
29682968
Some((&*k, v))
29692969
}
29702970

2971-
/// Returns a reference to the the key and value of the previous element
2971+
/// Returns a reference to the key and value of the previous element
29722972
/// without moving the cursor.
29732973
///
29742974
/// If the cursor is at the start of the map then `None` is returned.
@@ -3056,7 +3056,7 @@ impl<'a, K, V, A> CursorMutKey<'a, K, V, A> {
30563056
}
30573057
}
30583058

3059-
/// Returns a reference to the the key and value of the next element without
3059+
/// Returns a reference to the key and value of the next element without
30603060
/// moving the cursor.
30613061
///
30623062
/// If the cursor is at the end of the map then `None` is returned
@@ -3068,7 +3068,7 @@ impl<'a, K, V, A> CursorMutKey<'a, K, V, A> {
30683068
Some(kv)
30693069
}
30703070

3071-
/// Returns a reference to the the key and value of the previous element
3071+
/// Returns a reference to the key and value of the previous element
30723072
/// without moving the cursor.
30733073
///
30743074
/// If the cursor is at the start of the map then `None` is returned.

std/src/sys/pal/unix/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub const TIMESPEC_MAX: libc::timespec =
1010
// This additional constant is only used when calling
1111
// `libc::pthread_cond_timedwait`.
1212
#[cfg(target_os = "nto")]
13-
pub(super) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec {
13+
pub(in crate::sys) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec {
1414
tv_sec: (u64::MAX / NSEC_PER_SEC) as i64,
1515
tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64,
1616
};
@@ -204,7 +204,7 @@ impl Timespec {
204204
// On QNX Neutrino, the maximum timespec for e.g. pthread_cond_timedwait
205205
// is 2^64 nanoseconds
206206
#[cfg(target_os = "nto")]
207-
pub(super) fn to_timespec_capped(&self) -> Option<libc::timespec> {
207+
pub(in crate::sys) fn to_timespec_capped(&self) -> Option<libc::timespec> {
208208
// Check if timeout in nanoseconds would fit into an u64
209209
if (self.tv_nsec.0 as u64)
210210
.checked_add((self.tv_sec as u64).checked_mul(NSEC_PER_SEC)?)

0 commit comments

Comments
 (0)