rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std: Rename Iterator adaptor types to drop the -Iterator suffix

Browse Source 
Drop the "Iterator" suffix for the the structs in std::iterator.
Filter, Zip, Chain etc. are shorter type names for when iterator
pipelines need their types written out in full in return value types, so
it's easier to read and write. the iterator module already forms enough
namespace.
This commit is contained in:
blake2-ppc
2013-07-27 23:41:20 +02:00
parent 52dbe138cf
commit 4b45f47881
8 changed files with 111 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstd/str.rs
View File

@@ -23,7 +23,7 @@ use char::Char;
use clone::Clone;
use container::{Container, Mutable};
use iter::Times;
use iterator::{Iterator, FromIterator, IteratorUtil, FilterIterator, AdditiveIterator, MapIterator};
use iterator::{Iterator, FromIterator, IteratorUtil, Filter, AdditiveIterator, Map};
use libc;
use num::Zero;
use option::{None, Option, Some};
@@ -295,12 +295,11 @@ pub struct CharSplitIterator<'self,Sep> {
/// An iterator over the words of a string, separated by an sequence of whitespace
pub type WordIterator<'self> =
FilterIterator<'self, &'self str,
CharSplitIterator<'self, extern "Rust" fn(char) -> bool>>;
Filter<'self, &'self str, CharSplitIterator<'self, extern "Rust" fn(char) -> bool>>;
/// An iterator over the lines of a string, separated by either `\n` or (`\r\n`).
pub type AnyLineIterator<'self> =
MapIterator<'self, &'self str, &'self str, CharSplitIterator<'self, char>>;
Map<'self, &'self str, &'self str, CharSplitIterator<'self, char>>;
impl<'self, Sep: CharEq> Iterator<&'self str> for CharSplitIterator<'self, Sep> {
#[inline]