Skip to content

Commit 507d97b

Browse files
committedJun 2, 2021
Update expressions where we can use array's IntoIterator implementation
1 parent 01d4d46 commit 507d97b

File tree

7 files changed

+16
-24
lines changed

7 files changed

+16
-24
lines changed
 

‎library/alloc/benches/vec.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -551,19 +551,13 @@ const LEN: usize = 16384;
551551
#[bench]
552552
fn bench_chain_collect(b: &mut Bencher) {
553553
let data = black_box([0; LEN]);
554-
b.iter(|| data.iter().cloned().chain([1].iter().cloned()).collect::<Vec<_>>());
554+
b.iter(|| data.iter().cloned().chain([1]).collect::<Vec<_>>());
555555
}
556556

557557
#[bench]
558558
fn bench_chain_chain_collect(b: &mut Bencher) {
559559
let data = black_box([0; LEN]);
560-
b.iter(|| {
561-
data.iter()
562-
.cloned()
563-
.chain([1].iter().cloned())
564-
.chain([2].iter().cloned())
565-
.collect::<Vec<_>>()
566-
});
560+
b.iter(|| data.iter().cloned().chain([1]).chain([2]).collect::<Vec<_>>());
567561
}
568562

569563
#[bench]

‎library/alloc/src/vec/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ impl<T, A: Allocator> Vec<T, A> {
921921
///
922922
/// ```
923923
/// let mut vec = Vec::with_capacity(10);
924-
/// vec.extend([1, 2, 3].iter().cloned());
924+
/// vec.extend([1, 2, 3]);
925925
/// assert_eq!(vec.capacity(), 10);
926926
/// vec.shrink_to_fit();
927927
/// assert!(vec.capacity() >= 3);
@@ -950,7 +950,7 @@ impl<T, A: Allocator> Vec<T, A> {
950950
/// ```
951951
/// #![feature(shrink_to)]
952952
/// let mut vec = Vec::with_capacity(10);
953-
/// vec.extend([1, 2, 3].iter().cloned());
953+
/// vec.extend([1, 2, 3]);
954954
/// assert_eq!(vec.capacity(), 10);
955955
/// vec.shrink_to(4);
956956
/// assert!(vec.capacity() >= 4);
@@ -984,7 +984,7 @@ impl<T, A: Allocator> Vec<T, A> {
984984
///
985985
/// ```
986986
/// let mut vec = Vec::with_capacity(10);
987-
/// vec.extend([1, 2, 3].iter().cloned());
987+
/// vec.extend([1, 2, 3]);
988988
///
989989
/// assert_eq!(vec.capacity(), 10);
990990
/// let slice = vec.into_boxed_slice();
@@ -2586,7 +2586,7 @@ impl<T, A: Allocator> Vec<T, A> {
25862586
/// ```
25872587
/// let mut v = vec![1, 2, 3];
25882588
/// let new = [7, 8];
2589-
/// let u: Vec<_> = v.splice(..2, new.iter().cloned()).collect();
2589+
/// let u: Vec<_> = v.splice(..2, new).collect();
25902590
/// assert_eq!(v, &[7, 8, 3]);
25912591
/// assert_eq!(u, &[1, 2]);
25922592
/// ```

‎library/alloc/src/vec/splice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use super::{Drain, Vec};
1414
/// ```
1515
/// let mut v = vec![0, 1, 2];
1616
/// let new = [7, 8];
17-
/// let iter: std::vec::Splice<_> = v.splice(1.., new.iter().cloned());
17+
/// let iter: std::vec::Splice<_> = v.splice(1.., new);
1818
/// ```
1919
#[derive(Debug)]
2020
#[stable(feature = "vec_splice", since = "1.21.0")]

‎library/alloc/tests/vec.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ fn test_drain_leak() {
793793
fn test_splice() {
794794
let mut v = vec![1, 2, 3, 4, 5];
795795
let a = [10, 11, 12];
796-
v.splice(2..4, a.iter().cloned());
796+
v.splice(2..4, a);
797797
assert_eq!(v, &[1, 2, 10, 11, 12, 5]);
798798
v.splice(1..3, Some(20));
799799
assert_eq!(v, &[1, 20, 11, 12, 5]);
@@ -803,7 +803,7 @@ fn test_splice() {
803803
fn test_splice_inclusive_range() {
804804
let mut v = vec![1, 2, 3, 4, 5];
805805
let a = [10, 11, 12];
806-
let t1: Vec<_> = v.splice(2..=3, a.iter().cloned()).collect();
806+
let t1: Vec<_> = v.splice(2..=3, a).collect();
807807
assert_eq!(v, &[1, 2, 10, 11, 12, 5]);
808808
assert_eq!(t1, &[3, 4]);
809809
let t2: Vec<_> = v.splice(1..=2, Some(20)).collect();
@@ -816,15 +816,15 @@ fn test_splice_inclusive_range() {
816816
fn test_splice_out_of_bounds() {
817817
let mut v = vec![1, 2, 3, 4, 5];
818818
let a = [10, 11, 12];
819-
v.splice(5..6, a.iter().cloned());
819+
v.splice(5..6, a);
820820
}
821821

822822
#[test]
823823
#[should_panic]
824824
fn test_splice_inclusive_out_of_bounds() {
825825
let mut v = vec![1, 2, 3, 4, 5];
826826
let a = [10, 11, 12];
827-
v.splice(5..=5, a.iter().cloned());
827+
v.splice(5..=5, a);
828828
}
829829

830830
#[test]
@@ -848,7 +848,7 @@ fn test_splice_unbounded() {
848848
fn test_splice_forget() {
849849
let mut v = vec![1, 2, 3, 4, 5];
850850
let a = [10, 11, 12];
851-
std::mem::forget(v.splice(2..4, a.iter().cloned()));
851+
std::mem::forget(v.splice(2..4, a));
852852
assert_eq!(v, &[1, 2]);
853853
}
854854

‎library/core/src/char/methods.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl char {
5858
/// ];
5959
///
6060
/// assert_eq!(
61-
/// decode_utf16(v.iter().cloned())
61+
/// decode_utf16(v)
6262
/// .map(|r| r.map_err(|e| e.unpaired_surrogate()))
6363
/// .collect::<Vec<_>>(),
6464
/// vec![
@@ -82,7 +82,7 @@ impl char {
8282
/// ];
8383
///
8484
/// assert_eq!(
85-
/// decode_utf16(v.iter().cloned())
85+
/// decode_utf16(v)
8686
/// .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
8787
/// .collect::<String>(),
8888
/// "𝄞mus�ic�"

‎library/core/tests/array.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use core::array::{self, IntoIter};
1+
use core::array;
22
use core::convert::TryFrom;
33

44
#[test]

‎library/core/tests/iter/adapters/zip.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,7 @@ fn test_zip_trusted_random_access_composition() {
236236
fn test_double_ended_zip() {
237237
let xs = [1, 2, 3, 4, 5, 6];
238238
let ys = [1, 2, 3, 7];
239-
let a = xs.iter().cloned();
240-
let b = ys.iter().cloned();
241-
let mut it = a.zip(b);
239+
let mut it = xs.iter().cloned().zip(ys);
242240
assert_eq!(it.next(), Some((1, 1)));
243241
assert_eq!(it.next(), Some((2, 2)));
244242
assert_eq!(it.next_back(), Some((4, 7)));

0 commit comments

Comments
 (0)
Please sign in to comment.