From 93569acdbe09a63a670a5a5ad6bd0a2e2d8a90b9 Mon Sep 17 00:00:00 2001 From: Kamal Marhubi Date: Mon, 28 Mar 2016 13:55:47 -0400 Subject: 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`. --- src/libcollections/binary_heap.rs | 8 ++++---- src/libcollections/string.rs | 28 ++++++++++++++-------------- src/libcollections/vec.rs | 8 ++++---- src/libcollections/vec_deque.rs | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/libcollections') diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index ba317334cfa..2988a636095 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -980,13 +980,13 @@ impl<'a, T> IntoIterator for &'a BinaryHeap where T: Ord { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for BinaryHeap { - fn extend>(&mut self, iterable: I) { - let iter = iterable.into_iter(); - let (lower, _) = iter.size_hint(); + fn extend>(&mut self, iter: I) { + let iterator = iter.into_iter(); + let (lower, _) = iterator.size_hint(); self.reserve(lower); - for elem in iter { + for elem in iterator { self.push(elem); } } diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index d2432a4b032..6731b15fb2e 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -1388,35 +1388,35 @@ impl Clone for String { #[stable(feature = "rust1", since = "1.0.0")] impl FromIterator for String { - fn from_iter>(iterable: I) -> String { + fn from_iter>(iter: I) -> String { let mut buf = String::new(); - buf.extend(iterable); + buf.extend(iter); buf } } #[stable(feature = "rust1", since = "1.0.0")] impl<'a> FromIterator<&'a str> for String { - fn from_iter>(iterable: I) -> String { + fn from_iter>(iter: I) -> String { let mut buf = String::new(); - buf.extend(iterable); + buf.extend(iter); buf } } #[stable(feature = "extend_string", since = "1.4.0")] impl FromIterator for String { - fn from_iter>(iterable: I) -> String { + fn from_iter>(iter: I) -> String { let mut buf = String::new(); - buf.extend(iterable); + buf.extend(iter); buf } } #[stable(feature = "rust1", since = "1.0.0")] impl Extend for String { - fn extend>(&mut self, iterable: I) { - let iterator = iterable.into_iter(); + fn extend>(&mut self, iter: I) { + let iterator = iter.into_iter(); let (lower_bound, _) = iterator.size_hint(); self.reserve(lower_bound); for ch in iterator { @@ -1427,15 +1427,15 @@ impl Extend for String { #[stable(feature = "extend_ref", since = "1.2.0")] impl<'a> Extend<&'a char> for String { - fn extend>(&mut self, iterable: I) { - self.extend(iterable.into_iter().cloned()); + fn extend>(&mut self, iter: I) { + self.extend(iter.into_iter().cloned()); } } #[stable(feature = "rust1", since = "1.0.0")] impl<'a> Extend<&'a str> for String { - fn extend>(&mut self, iterable: I) { - for s in iterable { + fn extend>(&mut self, iter: I) { + for s in iter { self.push_str(s) } } @@ -1443,8 +1443,8 @@ impl<'a> Extend<&'a str> for String { #[stable(feature = "extend_string", since = "1.4.0")] impl Extend for String { - fn extend>(&mut self, iterable: I) { - for s in iterable { + fn extend>(&mut self, iter: I) { + for s in iter { self.push_str(&s) } } diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 4f4eae67e37..dde5cbb508e 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1302,13 +1302,13 @@ impl ops::DerefMut for Vec { #[stable(feature = "rust1", since = "1.0.0")] impl FromIterator for Vec { #[inline] - fn from_iter>(iterable: I) -> Vec { + fn from_iter>(iter: I) -> Vec { // Unroll the first iteration, as the vector is going to be // expanded on this iteration in every case when the iterable is not // empty, but the loop in extend_desugared() is not going to see the // vector being full in the few subsequent loop iterations. // So we get better branch prediction. - let mut iterator = iterable.into_iter(); + let mut iterator = iter.into_iter(); let mut vector = match iterator.next() { None => return Vec::new(), Some(element) => { @@ -1389,8 +1389,8 @@ impl<'a, T> IntoIterator for &'a mut Vec { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for Vec { #[inline] - fn extend>(&mut self, iterable: I) { - self.extend_desugared(iterable.into_iter()) + fn extend>(&mut self, iter: I) { + self.extend_desugared(iter.into_iter()) } } diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs index 3e48f14d387..9e2b25d178f 100644 --- a/src/libcollections/vec_deque.rs +++ b/src/libcollections/vec_deque.rs @@ -2057,8 +2057,8 @@ impl IndexMut for VecDeque { #[stable(feature = "rust1", since = "1.0.0")] impl FromIterator for VecDeque { - fn from_iter>(iterable: T) -> VecDeque { - let iterator = iterable.into_iter(); + fn from_iter>(iter: T) -> VecDeque { + let iterator = iter.into_iter(); let (lower, _) = iterator.size_hint(); let mut deq = VecDeque::with_capacity(lower); deq.extend(iterator); -- cgit 1.4.1-3-g733a5