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/libcollections/string.rs | |
| 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/libcollections/string.rs')
| -rw-r--r-- | src/libcollections/string.rs | 28 |
1 files changed, 14 insertions, 14 deletions
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<char> for String { - fn from_iter<I: IntoIterator<Item = char>>(iterable: I) -> String { + fn from_iter<I: IntoIterator<Item = char>>(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<I: IntoIterator<Item = &'a str>>(iterable: I) -> String { + fn from_iter<I: IntoIterator<Item = &'a str>>(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<String> for String { - fn from_iter<I: IntoIterator<Item = String>>(iterable: I) -> String { + fn from_iter<I: IntoIterator<Item = String>>(iter: I) -> String { let mut buf = String::new(); - buf.extend(iterable); + buf.extend(iter); buf } } #[stable(feature = "rust1", since = "1.0.0")] impl Extend<char> for String { - fn extend<I: IntoIterator<Item = char>>(&mut self, iterable: I) { - let iterator = iterable.into_iter(); + fn extend<I: IntoIterator<Item = char>>(&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<char> for String { #[stable(feature = "extend_ref", since = "1.2.0")] impl<'a> Extend<&'a char> for String { - fn extend<I: IntoIterator<Item = &'a char>>(&mut self, iterable: I) { - self.extend(iterable.into_iter().cloned()); + fn extend<I: IntoIterator<Item = &'a char>>(&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<I: IntoIterator<Item = &'a str>>(&mut self, iterable: I) { - for s in iterable { + fn extend<I: IntoIterator<Item = &'a str>>(&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<String> for String { - fn extend<I: IntoIterator<Item = String>>(&mut self, iterable: I) { - for s in iterable { + fn extend<I: IntoIterator<Item = String>>(&mut self, iter: I) { + for s in iter { self.push_str(&s) } } |
