diff options
| author | Kamal Marhubi <kamal@marhubi.com> | 2016-03-28 13:55:47 -0400 |
|---|---|---|
| committer | Kamal Marhubi <kamal@marhubi.com> | 2016-03-28 13:59:38 -0400 |
| commit | 93569acdbe09a63a670a5a5ad6bd0a2e2d8a90b9 (patch) | |
| tree | 45708e55bd2773669c964b2d226a37fb25d06acf /src/libcore | |
| parent | 3602f34e9cfe542210b6ac4302ae8d0f0799965b (diff) | |
| download | rust-93569acdbe09a63a670a5a5ad6bd0a2e2d8a90b9.tar.gz rust-93569acdbe09a63a670a5a5ad6bd0a2e2d8a90b9.zip | |
style: Use `iter` for IntoIterator parameter names
This commit standardizes the codebase on `iter` for parameters with IntoIterator bounds. Previously about 40% of IntoIterator parameters were named `iterable`, with most of the rest being named `iter`. There was a single place where it was named `iterator`.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 72421e94a43..d9d47866ea2 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -2458,10 +2458,10 @@ impl<'a, I: Iterator + ?Sized> Iterator for &'a mut I { /// /// // and we'll implement FromIterator /// impl FromIterator<i32> for MyCollection { -/// fn from_iter<I: IntoIterator<Item=i32>>(iterator: I) -> Self { +/// fn from_iter<I: IntoIterator<Item=i32>>(iter: I) -> Self { /// let mut c = MyCollection::new(); /// -/// for i in iterator { +/// for i in iter { /// c.add(i); /// } /// @@ -2508,7 +2508,7 @@ pub trait FromIterator<A>: Sized { /// assert_eq!(v, vec![5, 5, 5, 5, 5]); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - fn from_iter<T: IntoIterator<Item=A>>(iterator: T) -> Self; + fn from_iter<T: IntoIterator<Item=A>>(iter: T) -> Self; } /// Conversion into an `Iterator`. @@ -2683,11 +2683,11 @@ impl<I: Iterator> IntoIterator for I { /// // This is a bit simpler with the concrete type signature: we can call /// // extend on anything which can be turned into an Iterator which gives /// // us i32s. Because we need i32s to put into MyCollection. -/// fn extend<T: IntoIterator<Item=i32>>(&mut self, iterable: T) { +/// fn extend<T: IntoIterator<Item=i32>>(&mut self, iter: T) { /// /// // The implementation is very straightforward: loop through the /// // iterator, and add() each element to ourselves. -/// for elem in iterable { +/// for elem in iter { /// self.add(elem); /// } /// } @@ -2727,7 +2727,7 @@ pub trait Extend<A> { /// assert_eq!("abcdef", &message); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - fn extend<T: IntoIterator<Item=A>>(&mut self, iterable: T); + fn extend<T: IntoIterator<Item=A>>(&mut self, iter: T); } /// An iterator able to yield elements from both ends. |
