Skip to content

Commit 90dd359

Browse files
committed
Use iter() for iterating arrays by slice
These `into_iter()` calls will change from iterating references to values if we ever get `IntoIterator` for arrays, which may break the code using that iterator. Calling `iter()` is future proof.
1 parent 823a75d commit 90dd359

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/liballoc/tests/btree/set.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ fn test_union() {
143143
#[test]
144144
// Only tests the simple function definition with respect to intersection
145145
fn test_is_disjoint() {
146-
let one = [1].into_iter().collect::<BTreeSet<_>>();
147-
let two = [2].into_iter().collect::<BTreeSet<_>>();
146+
let one = [1].iter().collect::<BTreeSet<_>>();
147+
let two = [2].iter().collect::<BTreeSet<_>>();
148148
assert!(one.is_disjoint(&two));
149149
}
150150

src/libcore/iter/traits/iterator.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ pub trait Iterator {
356356
///
357357
/// ```
358358
/// let a = [0, 1, 2, 3, 4, 5];
359-
/// let mut iter = a.into_iter().step_by(2);
359+
/// let mut iter = a.iter().step_by(2);
360360
///
361361
/// assert_eq!(iter.next(), Some(&0));
362362
/// assert_eq!(iter.next(), Some(&2));
@@ -531,7 +531,7 @@ pub trait Iterator {
531531
/// ```
532532
/// let a = [1, 2, 3];
533533
///
534-
/// let mut iter = a.into_iter().map(|x| 2 * x);
534+
/// let mut iter = a.iter().map(|x| 2 * x);
535535
///
536536
/// assert_eq!(iter.next(), Some(2));
537537
/// assert_eq!(iter.next(), Some(4));
@@ -620,7 +620,7 @@ pub trait Iterator {
620620
/// ```
621621
/// let a = [0i32, 1, 2];
622622
///
623-
/// let mut iter = a.into_iter().filter(|x| x.is_positive());
623+
/// let mut iter = a.iter().filter(|x| x.is_positive());
624624
///
625625
/// assert_eq!(iter.next(), Some(&1));
626626
/// assert_eq!(iter.next(), Some(&2));
@@ -634,7 +634,7 @@ pub trait Iterator {
634634
/// ```
635635
/// let a = [0, 1, 2];
636636
///
637-
/// let mut iter = a.into_iter().filter(|x| **x > 1); // need two *s!
637+
/// let mut iter = a.iter().filter(|x| **x > 1); // need two *s!
638638
///
639639
/// assert_eq!(iter.next(), Some(&2));
640640
/// assert_eq!(iter.next(), None);
@@ -646,7 +646,7 @@ pub trait Iterator {
646646
/// ```
647647
/// let a = [0, 1, 2];
648648
///
649-
/// let mut iter = a.into_iter().filter(|&x| *x > 1); // both & and *
649+
/// let mut iter = a.iter().filter(|&x| *x > 1); // both & and *
650650
///
651651
/// assert_eq!(iter.next(), Some(&2));
652652
/// assert_eq!(iter.next(), None);
@@ -657,7 +657,7 @@ pub trait Iterator {
657657
/// ```
658658
/// let a = [0, 1, 2];
659659
///
660-
/// let mut iter = a.into_iter().filter(|&&x| x > 1); // two &s
660+
/// let mut iter = a.iter().filter(|&&x| x > 1); // two &s
661661
///
662662
/// assert_eq!(iter.next(), Some(&2));
663663
/// assert_eq!(iter.next(), None);
@@ -837,7 +837,7 @@ pub trait Iterator {
837837
/// ```
838838
/// let a = [-1i32, 0, 1];
839839
///
840-
/// let mut iter = a.into_iter().skip_while(|x| x.is_negative());
840+
/// let mut iter = a.iter().skip_while(|x| x.is_negative());
841841
///
842842
/// assert_eq!(iter.next(), Some(&0));
843843
/// assert_eq!(iter.next(), Some(&1));
@@ -851,7 +851,7 @@ pub trait Iterator {
851851
/// ```
852852
/// let a = [-1, 0, 1];
853853
///
854-
/// let mut iter = a.into_iter().skip_while(|x| **x < 0); // need two *s!
854+
/// let mut iter = a.iter().skip_while(|x| **x < 0); // need two *s!
855855
///
856856
/// assert_eq!(iter.next(), Some(&0));
857857
/// assert_eq!(iter.next(), Some(&1));
@@ -863,7 +863,7 @@ pub trait Iterator {
863863
/// ```
864864
/// let a = [-1, 0, 1, -2];
865865
///
866-
/// let mut iter = a.into_iter().skip_while(|x| **x < 0);
866+
/// let mut iter = a.iter().skip_while(|x| **x < 0);
867867
///
868868
/// assert_eq!(iter.next(), Some(&0));
869869
/// assert_eq!(iter.next(), Some(&1));
@@ -898,7 +898,7 @@ pub trait Iterator {
898898
/// ```
899899
/// let a = [-1i32, 0, 1];
900900
///
901-
/// let mut iter = a.into_iter().take_while(|x| x.is_negative());
901+
/// let mut iter = a.iter().take_while(|x| x.is_negative());
902902
///
903903
/// assert_eq!(iter.next(), Some(&-1));
904904
/// assert_eq!(iter.next(), None);
@@ -911,7 +911,7 @@ pub trait Iterator {
911911
/// ```
912912
/// let a = [-1, 0, 1];
913913
///
914-
/// let mut iter = a.into_iter().take_while(|x| **x < 0); // need two *s!
914+
/// let mut iter = a.iter().take_while(|x| **x < 0); // need two *s!
915915
///
916916
/// assert_eq!(iter.next(), Some(&-1));
917917
/// assert_eq!(iter.next(), None);
@@ -922,7 +922,7 @@ pub trait Iterator {
922922
/// ```
923923
/// let a = [-1, 0, 1, -2];
924924
///
925-
/// let mut iter = a.into_iter().take_while(|x| **x < 0);
925+
/// let mut iter = a.iter().take_while(|x| **x < 0);
926926
///
927927
/// assert_eq!(iter.next(), Some(&-1));
928928
///
@@ -937,7 +937,7 @@ pub trait Iterator {
937937
///
938938
/// ```
939939
/// let a = [1, 2, 3, 4];
940-
/// let mut iter = a.into_iter();
940+
/// let mut iter = a.iter();
941941
///
942942
/// let result: Vec<i32> = iter.by_ref()
943943
/// .take_while(|n| **n != 3)
@@ -1321,7 +1321,7 @@ pub trait Iterator {
13211321
/// ```
13221322
/// let a = [1, 2, 3];
13231323
///
1324-
/// let iter = a.into_iter();
1324+
/// let iter = a.iter();
13251325
///
13261326
/// let sum: i32 = iter.take(5).fold(0, |acc, i| acc + i );
13271327
///
@@ -1334,7 +1334,7 @@ pub trait Iterator {
13341334
/// // let's try that again
13351335
/// let a = [1, 2, 3];
13361336
///
1337-
/// let mut iter = a.into_iter();
1337+
/// let mut iter = a.iter();
13381338
///
13391339
/// // instead, we add in a .by_ref()
13401340
/// let sum: i32 = iter.by_ref().take(2).fold(0, |acc, i| acc + i );
@@ -1479,7 +1479,7 @@ pub trait Iterator {
14791479
/// let a = [1, 2, 3];
14801480
///
14811481
/// let (even, odd): (Vec<i32>, Vec<i32>) = a
1482-
/// .into_iter()
1482+
/// .iter()
14831483
/// .partition(|&n| n % 2 == 0);
14841484
///
14851485
/// assert_eq!(even, vec![2]);

src/librustdoc/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ fn check_deprecated_options(matches: &getopts::Matches, diag: &errors::Handler)
538538
"passes",
539539
];
540540

541-
for flag in deprecated_flags.into_iter() {
541+
for flag in deprecated_flags.iter() {
542542
if matches.opt_present(flag) {
543543
let mut err = diag.struct_warn(&format!("the '{}' flag is considered deprecated",
544544
flag));

src/librustdoc/html/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ pub fn initial_ids() -> Vec<String> {
506506
"methods",
507507
"deref-methods",
508508
"implementations",
509-
].into_iter().map(|id| (String::from(*id))).collect()
509+
].iter().map(|id| (String::from(*id))).collect()
510510
}
511511

512512
/// Generates the documentation for `crate` into the directory `dst`

0 commit comments

Comments
 (0)