Skip to content

Commit c185610

Browse files
committed
Auto merge of #91761 - matthiaskrgr:rollup-bjowmvz, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #91668 (Remove the match on `ErrorKind::Other`) - #91678 (Add tests fixed by #90023) - #91679 (Move core/stream/stream/mod.rs to core/stream/stream.rs) - #91681 (fix typo in `intrinsics::raw_eq` docs) - #91686 (Fix `Vec::reserve_exact` documentation) - #91697 (Delete Utf8Lossy::from_str) - #91706 (Add unstable book entries for parts of asm that are not being stabilized) - #91709 (Replace iterator-based set construction by *Set::From<[T; N]>) - #91716 (Improve x.py logging and defaults a bit more) - #91747 (Add pierwill to .mailmap) - #91755 (Fix since attribute for const_linked_list_new feature) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 82575a1 + 637859b commit c185610

File tree

24 files changed

+614
-76
lines changed

24 files changed

+614
-76
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ Philipp Brüschweiler <[email protected]> <[email protected]>
246246
Philipp Krones <[email protected]> flip1995 <[email protected]>
247247
248248
Philipp Matthias Schäfer <[email protected]>
249+
249250
Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
250251
Rafael Ávila de Espíndola <[email protected]> Rafael Avila de Espindola <espindola@dream.(none)>
251252
Ralph Giles <[email protected]> Ralph Giles <[email protected]>

library/alloc/src/collections/btree/set.rs

+18-19
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ impl<T> BTreeSet<T> {
491491
/// ```
492492
/// use std::collections::BTreeSet;
493493
///
494-
/// let set: BTreeSet<_> = [1, 2, 3].iter().cloned().collect();
494+
/// let set = BTreeSet::from([1, 2, 3]);
495495
/// assert_eq!(set.contains(&1), true);
496496
/// assert_eq!(set.contains(&4), false);
497497
/// ```
@@ -515,7 +515,7 @@ impl<T> BTreeSet<T> {
515515
/// ```
516516
/// use std::collections::BTreeSet;
517517
///
518-
/// let set: BTreeSet<_> = [1, 2, 3].iter().cloned().collect();
518+
/// let set = BTreeSet::from([1, 2, 3]);
519519
/// assert_eq!(set.get(&2), Some(&2));
520520
/// assert_eq!(set.get(&4), None);
521521
/// ```
@@ -536,7 +536,7 @@ impl<T> BTreeSet<T> {
536536
/// ```
537537
/// use std::collections::BTreeSet;
538538
///
539-
/// let a: BTreeSet<_> = [1, 2, 3].iter().cloned().collect();
539+
/// let a = BTreeSet::from([1, 2, 3]);
540540
/// let mut b = BTreeSet::new();
541541
///
542542
/// assert_eq!(a.is_disjoint(&b), true);
@@ -562,7 +562,7 @@ impl<T> BTreeSet<T> {
562562
/// ```
563563
/// use std::collections::BTreeSet;
564564
///
565-
/// let sup: BTreeSet<_> = [1, 2, 3].iter().cloned().collect();
565+
/// let sup = BTreeSet::from([1, 2, 3]);
566566
/// let mut set = BTreeSet::new();
567567
///
568568
/// assert_eq!(set.is_subset(&sup), true);
@@ -639,7 +639,7 @@ impl<T> BTreeSet<T> {
639639
/// ```
640640
/// use std::collections::BTreeSet;
641641
///
642-
/// let sub: BTreeSet<_> = [1, 2].iter().cloned().collect();
642+
/// let sub = BTreeSet::from([1, 2]);
643643
/// let mut set = BTreeSet::new();
644644
///
645645
/// assert_eq!(set.is_superset(&sub), false);
@@ -853,7 +853,7 @@ impl<T> BTreeSet<T> {
853853
/// ```
854854
/// use std::collections::BTreeSet;
855855
///
856-
/// let mut set: BTreeSet<_> = [1, 2, 3].iter().cloned().collect();
856+
/// let mut set = BTreeSet::from([1, 2, 3]);
857857
/// assert_eq!(set.take(&2), Some(2));
858858
/// assert_eq!(set.take(&2), None);
859859
/// ```
@@ -876,8 +876,7 @@ impl<T> BTreeSet<T> {
876876
/// ```
877877
/// use std::collections::BTreeSet;
878878
///
879-
/// let xs = [1, 2, 3, 4, 5, 6];
880-
/// let mut set: BTreeSet<i32> = xs.iter().cloned().collect();
879+
/// let mut set = BTreeSet::from([1, 2, 3, 4, 5, 6]);
881880
/// // Keep only the even numbers.
882881
/// set.retain(|&k| k % 2 == 0);
883882
/// assert!(set.iter().eq([2, 4, 6].iter()));
@@ -1009,7 +1008,7 @@ impl<T> BTreeSet<T> {
10091008
/// ```
10101009
/// use std::collections::BTreeSet;
10111010
///
1012-
/// let set: BTreeSet<usize> = [1, 2, 3].iter().cloned().collect();
1011+
/// let set = BTreeSet::from([1, 2, 3]);
10131012
/// let mut set_iter = set.iter();
10141013
/// assert_eq!(set_iter.next(), Some(&1));
10151014
/// assert_eq!(set_iter.next(), Some(&2));
@@ -1022,7 +1021,7 @@ impl<T> BTreeSet<T> {
10221021
/// ```
10231022
/// use std::collections::BTreeSet;
10241023
///
1025-
/// let set: BTreeSet<usize> = [3, 1, 2].iter().cloned().collect();
1024+
/// let set = BTreeSet::from([3, 1, 2]);
10261025
/// let mut set_iter = set.iter();
10271026
/// assert_eq!(set_iter.next(), Some(&1));
10281027
/// assert_eq!(set_iter.next(), Some(&2));
@@ -1124,7 +1123,7 @@ impl<T> IntoIterator for BTreeSet<T> {
11241123
/// ```
11251124
/// use std::collections::BTreeSet;
11261125
///
1127-
/// let set: BTreeSet<usize> = [1, 2, 3, 4].iter().cloned().collect();
1126+
/// let set = BTreeSet::from([1, 2, 3, 4]);
11281127
///
11291128
/// let v: Vec<_> = set.into_iter().collect();
11301129
/// assert_eq!(v, [1, 2, 3, 4]);
@@ -1243,8 +1242,8 @@ impl<T: Ord + Clone> Sub<&BTreeSet<T>> for &BTreeSet<T> {
12431242
/// ```
12441243
/// use std::collections::BTreeSet;
12451244
///
1246-
/// let a: BTreeSet<_> = vec![1, 2, 3].into_iter().collect();
1247-
/// let b: BTreeSet<_> = vec![3, 4, 5].into_iter().collect();
1245+
/// let a = BTreeSet::from([1, 2, 3]);
1246+
/// let b = BTreeSet::from([3, 4, 5]);
12481247
///
12491248
/// let result = &a - &b;
12501249
/// let result_vec: Vec<_> = result.into_iter().collect();
@@ -1266,8 +1265,8 @@ impl<T: Ord + Clone> BitXor<&BTreeSet<T>> for &BTreeSet<T> {
12661265
/// ```
12671266
/// use std::collections::BTreeSet;
12681267
///
1269-
/// let a: BTreeSet<_> = vec![1, 2, 3].into_iter().collect();
1270-
/// let b: BTreeSet<_> = vec![2, 3, 4].into_iter().collect();
1268+
/// let a = BTreeSet::from([1, 2, 3]);
1269+
/// let b = BTreeSet::from([2, 3, 4]);
12711270
///
12721271
/// let result = &a ^ &b;
12731272
/// let result_vec: Vec<_> = result.into_iter().collect();
@@ -1289,8 +1288,8 @@ impl<T: Ord + Clone> BitAnd<&BTreeSet<T>> for &BTreeSet<T> {
12891288
/// ```
12901289
/// use std::collections::BTreeSet;
12911290
///
1292-
/// let a: BTreeSet<_> = vec![1, 2, 3].into_iter().collect();
1293-
/// let b: BTreeSet<_> = vec![2, 3, 4].into_iter().collect();
1291+
/// let a = BTreeSet::from([1, 2, 3]);
1292+
/// let b = BTreeSet::from([2, 3, 4]);
12941293
///
12951294
/// let result = &a & &b;
12961295
/// let result_vec: Vec<_> = result.into_iter().collect();
@@ -1312,8 +1311,8 @@ impl<T: Ord + Clone> BitOr<&BTreeSet<T>> for &BTreeSet<T> {
13121311
/// ```
13131312
/// use std::collections::BTreeSet;
13141313
///
1315-
/// let a: BTreeSet<_> = vec![1, 2, 3].into_iter().collect();
1316-
/// let b: BTreeSet<_> = vec![3, 4, 5].into_iter().collect();
1314+
/// let a = BTreeSet::from([1, 2, 3]);
1315+
/// let b = BTreeSet::from([3, 4, 5]);
13171316
///
13181317
/// let result = &a | &b;
13191318
/// let result_vec: Vec<_> = result.into_iter().collect();

library/alloc/src/collections/linked_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ impl<T> LinkedList<T> {
417417
/// let list: LinkedList<u32> = LinkedList::new();
418418
/// ```
419419
#[inline]
420-
#[rustc_const_stable(feature = "const_linked_list_new", since = "1.32.0")]
420+
#[rustc_const_stable(feature = "const_linked_list_new", since = "1.39.0")]
421421
#[stable(feature = "rust1", since = "1.0.0")]
422422
#[must_use]
423423
pub const fn new() -> Self {

library/alloc/src/vec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ impl<T, A: Allocator> Vec<T, A> {
822822
///
823823
/// # Panics
824824
///
825-
/// Panics if the new capacity overflows `usize`.
825+
/// Panics if the new capacity exceeds `isize::MAX` bytes.
826826
///
827827
/// # Examples
828828
///

library/core/src/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1919,7 +1919,7 @@ extern "rust-intrinsic" {
19191919

19201920
/// Determines whether the raw bytes of the two values are equal.
19211921
///
1922-
/// The is particularly handy for arrays, since it allows things like just
1922+
/// This is particularly handy for arrays, since it allows things like just
19231923
/// comparing `i96`s instead of forcing `alloca`s for `[6 x i16]`.
19241924
///
19251925
/// Above some backend-decided threshold this will emit calls to `memcmp`,

library/core/src/str/lossy.rs

-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ pub struct Utf8Lossy {
1212
}
1313

1414
impl Utf8Lossy {
15-
#[must_use]
16-
pub fn from_str(s: &str) -> &Utf8Lossy {
17-
Utf8Lossy::from_bytes(s.as_bytes())
18-
}
19-
2015
#[must_use]
2116
pub fn from_bytes(bytes: &[u8]) -> &Utf8Lossy {
2217
// SAFETY: Both use the same memory layout, and UTF-8 correctness isn't required.

0 commit comments

Comments
 (0)