diff options
| author | Sean Chalmers <sclhiannan@gmail.com> | 2014-01-23 20:41:57 +0100 |
|---|---|---|
| committer | Sean Chalmers <sclhiannan@gmail.com> | 2014-01-23 22:18:18 +0100 |
| commit | 292ed3e55c595505069a589e104e365779c27933 (patch) | |
| tree | 58c2e7c5c377cde755fa9fa0ce30109530d2c546 /src/libstd | |
| parent | 55d6e0e1b71186a0c246101059047c11f5274505 (diff) | |
Update flip() to be rev().
Consensus leaned in favour of using rev instead of flip.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/iter.rs | 48 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 10 | ||||
| -rw-r--r-- | src/libstd/str.rs | 24 | ||||
| -rw-r--r-- | src/libstd/trie.rs | 6 | ||||
| -rw-r--r-- | src/libstd/vec.rs | 22 |
5 files changed, 55 insertions, 55 deletions
diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index 0167127b6ce..a65da914373 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -670,7 +670,7 @@ pub trait DoubleEndedIterator<A>: Iterator<A> { /// Yield an element from the end of the range, returning `None` if the range is empty. fn next_back(&mut self) -> Option<A>; - /// Flip the direction of the iterator + /// Change the direction of the iterator /// /// The flipped iterator swaps the ends on an iterator that can already /// be iterated from the front and from the back. @@ -683,8 +683,8 @@ pub trait DoubleEndedIterator<A>: Iterator<A> { /// Note: Random access with flipped indices still only applies to the first /// `uint::max_value` elements of the original iterator. #[inline] - fn flip(self) -> Flip<Self> { - Flip{iter: self} + fn rev(self) -> Rev<Self> { + Rev{iter: self} } } @@ -759,30 +759,30 @@ pub trait ExactSize<A> : DoubleEndedIterator<A> { // Adaptors that may overflow in `size_hint` are not, i.e. `Chain`. impl<A, T: ExactSize<A>> ExactSize<(uint, A)> for Enumerate<T> {} impl<'a, A, T: ExactSize<A>> ExactSize<A> for Inspect<'a, A, T> {} -impl<A, T: ExactSize<A>> ExactSize<A> for Flip<T> {} +impl<A, T: ExactSize<A>> ExactSize<A> for Rev<T> {} impl<'a, A, B, T: ExactSize<A>> ExactSize<B> for Map<'a, A, B, T> {} impl<A, B, T: ExactSize<A>, U: ExactSize<B>> ExactSize<(A, B)> for Zip<T, U> {} /// An double-ended iterator with the direction inverted #[deriving(Clone)] -pub struct Flip<T> { +pub struct Rev<T> { priv iter: T } -impl<A, T: DoubleEndedIterator<A>> Iterator<A> for Flip<T> { +impl<A, T: DoubleEndedIterator<A>> Iterator<A> for Rev<T> { #[inline] fn next(&mut self) -> Option<A> { self.iter.next_back() } #[inline] fn size_hint(&self) -> (uint, Option<uint>) { self.iter.size_hint() } } -impl<A, T: DoubleEndedIterator<A>> DoubleEndedIterator<A> for Flip<T> { +impl<A, T: DoubleEndedIterator<A>> DoubleEndedIterator<A> for Rev<T> { #[inline] fn next_back(&mut self) -> Option<A> { self.iter.next() } } impl<A, T: DoubleEndedIterator<A> + RandomAccessIterator<A>> RandomAccessIterator<A> - for Flip<T> { + for Rev<T> { #[inline] fn indexable(&self) -> uint { self.iter.indexable() } #[inline] @@ -2590,12 +2590,12 @@ mod tests { } #[test] - fn test_flip() { + fn test_rev() { let xs = [2, 4, 6, 8, 10, 12, 14, 16]; let mut it = xs.iter(); it.next(); it.next(); - assert_eq!(it.flip().map(|&x| x).collect::<~[int]>(), ~[16, 14, 12, 10, 8, 6]); + assert_eq!(it.rev().map(|&x| x).collect::<~[int]>(), ~[16, 14, 12, 10, 8, 6]); } #[test] @@ -2662,7 +2662,7 @@ mod tests { fn test_double_ended_chain() { let xs = [1, 2, 3, 4, 5]; let ys = ~[7, 9, 11]; - let mut it = xs.iter().chain(ys.iter()).flip(); + let mut it = xs.iter().chain(ys.iter()).rev(); assert_eq!(it.next().unwrap(), &11) assert_eq!(it.next().unwrap(), &9) assert_eq!(it.next_back().unwrap(), &1) @@ -2764,10 +2764,10 @@ mod tests { } #[test] - fn test_random_access_flip() { + fn test_random_access_rev() { let xs = [1, 2, 3, 4, 5]; - check_randacc_iter(xs.iter().flip(), xs.len()); - let mut it = xs.iter().flip(); + check_randacc_iter(xs.iter().rev(), xs.len()); + let mut it = xs.iter().rev(); it.next(); it.next_back(); it.next(); @@ -2833,13 +2833,13 @@ mod tests { #[test] fn test_double_ended_range() { - assert_eq!(range(11i, 14).flip().collect::<~[int]>(), ~[13i, 12, 11]); - for _ in range(10i, 0).flip() { + assert_eq!(range(11i, 14).rev().collect::<~[int]>(), ~[13i, 12, 11]); + for _ in range(10i, 0).rev() { fail!("unreachable"); } - assert_eq!(range(11u, 14).flip().collect::<~[uint]>(), ~[13u, 12, 11]); - for _ in range(10u, 0).flip() { + assert_eq!(range(11u, 14).rev().collect::<~[uint]>(), ~[13u, 12, 11]); + for _ in range(10u, 0).rev() { fail!("unreachable"); } } @@ -2886,11 +2886,11 @@ mod tests { assert_eq!(range(0i, 5).collect::<~[int]>(), ~[0i, 1, 2, 3, 4]); assert_eq!(range(-10i, -1).collect::<~[int]>(), ~[-10, -9, -8, -7, -6, -5, -4, -3, -2]); - assert_eq!(range(0i, 5).flip().collect::<~[int]>(), ~[4, 3, 2, 1, 0]); + assert_eq!(range(0i, 5).rev().collect::<~[int]>(), ~[4, 3, 2, 1, 0]); assert_eq!(range(200, -5).collect::<~[int]>(), ~[]); - assert_eq!(range(200, -5).flip().collect::<~[int]>(), ~[]); + assert_eq!(range(200, -5).rev().collect::<~[int]>(), ~[]); assert_eq!(range(200, 200).collect::<~[int]>(), ~[]); - assert_eq!(range(200, 200).flip().collect::<~[int]>(), ~[]); + assert_eq!(range(200, 200).rev().collect::<~[int]>(), ~[]); assert_eq!(range(0i, 100).size_hint(), (100, Some(100))); // this test is only meaningful when sizeof uint < sizeof u64 @@ -2902,11 +2902,11 @@ mod tests { #[test] fn test_range_inclusive() { assert_eq!(range_inclusive(0i, 5).collect::<~[int]>(), ~[0i, 1, 2, 3, 4, 5]); - assert_eq!(range_inclusive(0i, 5).flip().collect::<~[int]>(), ~[5i, 4, 3, 2, 1, 0]); + assert_eq!(range_inclusive(0i, 5).rev().collect::<~[int]>(), ~[5i, 4, 3, 2, 1, 0]); assert_eq!(range_inclusive(200, -5).collect::<~[int]>(), ~[]); - assert_eq!(range_inclusive(200, -5).flip().collect::<~[int]>(), ~[]); + assert_eq!(range_inclusive(200, -5).rev().collect::<~[int]>(), ~[]); assert_eq!(range_inclusive(200, 200).collect::<~[int]>(), ~[200]); - assert_eq!(range_inclusive(200, 200).flip().collect::<~[int]>(), ~[200]); + assert_eq!(range_inclusive(200, 200).rev().collect::<~[int]>(), ~[200]); } #[test] diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index ebbb47296d4..cc0705ee76f 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -17,7 +17,7 @@ use clone::Clone; use container::Container; use cmp::Eq; use from_str::FromStr; -use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Flip, Iterator, Map}; +use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Rev, Iterator, Map}; use option::{Option, Some, None}; use str; use str::{CharSplits, OwnedStr, Str, StrVector, StrSlice}; @@ -35,7 +35,7 @@ pub type StrComponents<'a> = Map<'a, &'a str, Option<&'a str>, /// /// Each component is yielded as Option<&str> for compatibility with PosixPath, but /// every component in WindowsPath is guaranteed to be Some. -pub type RevStrComponents<'a> = Flip<Map<'a, &'a str, Option<&'a str>, +pub type RevStrComponents<'a> = Rev<Map<'a, &'a str, Option<&'a str>, CharSplits<'a, char>>>; /// Iterator that yields successive components of a Path as &[u8] @@ -571,8 +571,8 @@ impl GenericPath for Path { fn ends_with_path(&self, child: &Path) -> bool { if !child.is_relative() { return false; } - let mut selfit = self.str_components().flip(); - let mut childit = child.str_components().flip(); + let mut selfit = self.str_components().rev(); + let mut childit = child.str_components().rev(); loop { match (selfit.next(), childit.next()) { (Some(a), Some(b)) => if a != b { return false; }, @@ -628,7 +628,7 @@ impl Path { /// Returns an iterator that yields each component of the path in reverse as an Option<&str> /// See str_components() for details. pub fn rev_str_components<'a>(&'a self) -> RevStrComponents<'a> { - self.str_components().flip() + self.str_components().rev() } /// Returns an iterator that yields each component of the path in turn as a &[u8]. diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 97980555728..22c9ae606d3 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -102,7 +102,7 @@ use clone::{Clone, DeepClone}; use container::{Container, Mutable}; use iter::{Iterator, FromIterator, Extendable, range}; use iter::{Filter, AdditiveIterator, Map}; -use iter::{Flip, DoubleEndedIterator, ExactSize}; +use iter::{Rev, DoubleEndedIterator, ExactSize}; use libc; use num::{Saturating}; use option::{None, Option, Some}; @@ -376,11 +376,11 @@ impl<'a> DoubleEndedIterator<(uint, char)> for CharOffsets<'a> { /// External iterator for a string's characters in reverse order. /// Use with the `std::iter` module. -pub type RevChars<'a> = Flip<Chars<'a>>; +pub type RevChars<'a> = Rev<Chars<'a>>; /// External iterator for a string's characters and their byte offsets in reverse order. /// Use with the `std::iter` module. -pub type RevCharOffsets<'a> = Flip<CharOffsets<'a>>; +pub type RevCharOffsets<'a> = Rev<CharOffsets<'a>>; /// External iterator for a string's bytes. /// Use with the `std::iter` module. @@ -389,7 +389,7 @@ pub type Bytes<'a> = /// External iterator for a string's bytes in reverse order. /// Use with the `std::iter` module. -pub type RevBytes<'a> = Flip<Bytes<'a>>; +pub type RevBytes<'a> = Rev<Bytes<'a>>; /// An iterator over the substrings of a string, separated by `sep`. #[deriving(Clone)] @@ -405,7 +405,7 @@ pub struct CharSplits<'a, Sep> { /// An iterator over the substrings of a string, separated by `sep`, /// starting from the back of the string. -pub type RevCharSplits<'a, Sep> = Flip<CharSplits<'a, Sep>>; +pub type RevCharSplits<'a, Sep> = Rev<CharSplits<'a, Sep>>; /// An iterator over the substrings of a string, separated by `sep`, /// splitting at most `count` times. @@ -486,7 +486,7 @@ for CharSplits<'a, Sep> { let mut next_split = None; if self.only_ascii { - for (idx, byte) in self.string.bytes().enumerate().flip() { + for (idx, byte) in self.string.bytes().enumerate().rev() { if self.sep.matches(byte as char) && byte < 128u8 { next_split = Some((idx, idx + 1)); break; @@ -1980,7 +1980,7 @@ impl<'a> StrSlice<'a> for &'a str { #[inline] fn chars_rev(&self) -> RevChars<'a> { - self.chars().flip() + self.chars().rev() } #[inline] @@ -1990,7 +1990,7 @@ impl<'a> StrSlice<'a> for &'a str { #[inline] fn bytes_rev(&self) -> RevBytes<'a> { - self.bytes().flip() + self.bytes().rev() } #[inline] @@ -2000,7 +2000,7 @@ impl<'a> StrSlice<'a> for &'a str { #[inline] fn char_indices_rev(&self) -> RevCharOffsets<'a> { - self.char_indices().flip() + self.char_indices().rev() } #[inline] @@ -2035,7 +2035,7 @@ impl<'a> StrSlice<'a> for &'a str { #[inline] fn rsplit<Sep: CharEq>(&self, sep: Sep) -> RevCharSplits<'a, Sep> { - self.split(sep).flip() + self.split(sep).rev() } #[inline] @@ -3789,11 +3789,11 @@ mod tests { fn test_rev_split_char_iterator_no_trailing() { let data = "\nMäry häd ä little lämb\nLittle lämb\n"; - let mut split: ~[&str] = data.split('\n').flip().collect(); + let mut split: ~[&str] = data.split('\n').rev().collect(); split.reverse(); assert_eq!(split, ~["", "Märy häd ä little lämb", "Little lämb", ""]); - let mut split: ~[&str] = data.split_terminator('\n').flip().collect(); + let mut split: ~[&str] = data.split_terminator('\n').rev().collect(); split.reverse(); assert_eq!(split, ~["", "Märy häd ä little lämb", "Little lämb"]); } diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs index 0e8974ea0e7..8b9b41f027c 100644 --- a/src/libstd/trie.rs +++ b/src/libstd/trie.rs @@ -728,7 +728,7 @@ mod test_map { fn test_each_reverse_break() { let mut m = TrieMap::new(); - for x in range(uint::max_value - 10000, uint::max_value).flip() { + for x in range(uint::max_value - 10000, uint::max_value).rev() { m.insert(x, x / 2); } @@ -781,7 +781,7 @@ mod test_map { let last = uint::max_value; let mut map = TrieMap::new(); - for x in range(first, last).flip() { + for x in range(first, last).rev() { map.insert(x, x / 2); } @@ -803,7 +803,7 @@ mod test_map { let last = uint::max_value; let mut map = TrieMap::new(); - for x in range(first, last).flip() { + for x in range(first, last).rev() { map.insert(x, x / 2); } diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 3a5c2197978..41cae372dbb 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1067,7 +1067,7 @@ impl<'a,T> ImmutableVector<'a, T> for &'a [T] { #[inline] fn rev_iter(self) -> RevItems<'a, T> { - self.iter().flip() + self.iter().rev() } #[inline] @@ -1464,7 +1464,7 @@ impl<T> OwnedVector<T> for ~[T] { #[inline] fn move_rev_iter(self) -> RevMoveItems<T> { - self.move_iter().flip() + self.move_iter().rev() } fn reserve(&mut self, n: uint) { @@ -2300,7 +2300,7 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] { #[inline] fn mut_rev_iter(self) -> RevMutItems<'a, T> { - self.mut_iter().flip() + self.mut_iter().rev() } #[inline] @@ -2714,7 +2714,7 @@ impl<'a, T> RandomAccessIterator<&'a T> for Items<'a, T> { } iterator!{struct Items -> *T, &'a T} -pub type RevItems<'a, T> = Flip<Items<'a, T>>; +pub type RevItems<'a, T> = Rev<Items<'a, T>>; impl<'a, T> ExactSize<&'a T> for Items<'a, T> {} impl<'a, T> ExactSize<&'a mut T> for MutItems<'a, T> {} @@ -2724,7 +2724,7 @@ impl<'a, T> Clone for Items<'a, T> { } iterator!{struct MutItems -> *mut T, &'a mut T} -pub type RevMutItems<'a, T> = Flip<MutItems<'a, T>>; +pub type RevMutItems<'a, T> = Rev<MutItems<'a, T>>; /// An iterator over the subslices of the vector which are separated /// by elements that match `pred`. @@ -2882,7 +2882,7 @@ impl<T> Drop for MoveItems<T> { } /// An iterator that moves out of a vector in reverse order. -pub type RevMoveItems<T> = Flip<MoveItems<T>>; +pub type RevMoveItems<T> = Rev<MoveItems<T>>; impl<A> FromIterator<A> for ~[A] { fn from_iterator<T: Iterator<A>>(iterator: &mut T) -> ~[A] { @@ -3985,7 +3985,7 @@ mod tests { assert_eq!(v.chunks(3).collect::<~[&[int]]>(), ~[&[1i,2,3], &[4,5]]); assert_eq!(v.chunks(6).collect::<~[&[int]]>(), ~[&[1i,2,3,4,5]]); - assert_eq!(v.chunks(2).flip().collect::<~[&[int]]>(), ~[&[5i], &[3,4], &[1,2]]); + assert_eq!(v.chunks(2).rev().collect::<~[&[int]]>(), ~[&[5i], &[3,4], &[1,2]]); let it = v.chunks(2); assert_eq!(it.indexable(), 3); assert_eq!(it.idx(0).unwrap(), &[1,2]); @@ -4241,9 +4241,9 @@ mod tests { } #[test] - fn test_mut_splitator_flip() { + fn test_mut_splitator_rev() { let mut xs = [1,2,0,3,4,0,0,5,6,0]; - for slice in xs.mut_split(|x| *x == 0).flip().take(4) { + for slice in xs.mut_split(|x| *x == 0).rev().take(4) { slice.reverse(); } assert_eq!(xs, [1,2,0,4,3,0,0,6,5,0]); @@ -4262,9 +4262,9 @@ mod tests { } #[test] - fn test_mut_chunks_flip() { + fn test_mut_chunks_rev() { let mut v = [0u8, 1, 2, 3, 4, 5, 6]; - for (i, chunk) in v.mut_chunks(3).flip().enumerate() { + for (i, chunk) in v.mut_chunks(3).rev().enumerate() { for x in chunk.mut_iter() { *x = i as u8; } |
