diff options
| author | bors <bors@rust-lang.org> | 2015-06-11 18:10:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-11 18:10:08 +0000 |
| commit | b5b3a99f84f2b4dbf9495dccd7112c74f4357acc (patch) | |
| tree | cfdba2e1880f58d4e2c29e06fac2de4f76a34108 /src/libcore | |
| parent | deff2f50a97342c8b2f92a124ded2d2ead7b2996 (diff) | |
| parent | d7f5fa4636b12c3dadd626e708ec7cef654faf54 (diff) | |
| download | rust-b5b3a99f84f2b4dbf9495dccd7112c74f4357acc.tar.gz rust-b5b3a99f84f2b4dbf9495dccd7112c74f4357acc.zip | |
Auto merge of #26190 - Veedrac:no-iter, r=alexcrichton
Pull request for #26188.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter.rs | 12 | ||||
| -rw-r--r-- | src/libcore/num/flt2dec/bignum.rs | 6 | ||||
| -rw-r--r-- | src/libcore/option.rs | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index abee61ea9d6..ae2248206c4 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -177,7 +177,7 @@ pub trait Iterator { /// ``` /// let a = [0]; /// let b = [1]; - /// let mut it = a.iter().chain(b.iter()); + /// let mut it = a.iter().chain(&b); /// assert_eq!(it.next(), Some(&0)); /// assert_eq!(it.next(), Some(&1)); /// assert!(it.next().is_none()); @@ -200,7 +200,7 @@ pub trait Iterator { /// ``` /// let a = [0]; /// let b = [1]; - /// let mut it = a.iter().zip(b.iter()); + /// let mut it = a.iter().zip(&b); /// assert_eq!(it.next(), Some((&0, &1))); /// assert!(it.next().is_none()); /// ``` @@ -585,9 +585,9 @@ pub trait Iterator { for x in self { if f(&x) { - left.extend(Some(x).into_iter()) + left.extend(Some(x)) } else { - right.extend(Some(x).into_iter()) + right.extend(Some(x)) } } @@ -994,8 +994,8 @@ pub trait Iterator { us.extend(SizeHint(lo, hi, marker::PhantomData)); for (t, u) in self { - ts.extend(Some(t).into_iter()); - us.extend(Some(u).into_iter()); + ts.extend(Some(t)); + us.extend(Some(u)); } (ts, us) diff --git a/src/libcore/num/flt2dec/bignum.rs b/src/libcore/num/flt2dec/bignum.rs index d6a5e44a1fb..4f373c16f7c 100644 --- a/src/libcore/num/flt2dec/bignum.rs +++ b/src/libcore/num/flt2dec/bignum.rs @@ -146,7 +146,7 @@ macro_rules! define_bignum { let mut sz = cmp::max(self.size, other.size); let mut carry = false; - for (a, b) in self.base[..sz].iter_mut().zip(other.base[..sz].iter()) { + for (a, b) in self.base[..sz].iter_mut().zip(&other.base[..sz]) { let (c, v) = (*a).full_add(*b, carry); *a = v; carry = c; @@ -166,7 +166,7 @@ macro_rules! define_bignum { let sz = cmp::max(self.size, other.size); let mut noborrow = true; - for (a, b) in self.base[..sz].iter_mut().zip(other.base[..sz].iter()) { + for (a, b) in self.base[..sz].iter_mut().zip(&other.base[..sz]) { let (c, v) = (*a).full_add(!*b, noborrow); *a = v; noborrow = c; @@ -183,7 +183,7 @@ macro_rules! define_bignum { let mut sz = self.size; let mut carry = 0; - for a in self.base[..sz].iter_mut() { + for a in &mut self.base[..sz] { let (c, v) = (*a).full_mul(other, carry); *a = v; carry = c; diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 30ca64028e7..593c5e79d34 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -124,7 +124,7 @@ //! // but to start with we've just got `None`. //! let mut name_of_biggest_animal = None; //! let mut size_of_biggest_animal = 0; -//! for big_thing in all_the_big_things.iter() { +//! for big_thing in &all_the_big_things { //! match *big_thing { //! Kingdom::Animal(size, name) if size > size_of_biggest_animal => { //! // Now we've found the name of some big animal |
