From f9dee04aaabc0ee38f91744e07fe67f36ec6c8e9 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Fri, 9 Aug 2013 20:30:03 -0700 Subject: std: Iterator.len_ -> .len --- src/libstd/iterator.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/libstd/iterator.rs') diff --git a/src/libstd/iterator.rs b/src/libstd/iterator.rs index 811adb53cb4..dc9550f6e4d 100644 --- a/src/libstd/iterator.rs +++ b/src/libstd/iterator.rs @@ -409,7 +409,6 @@ pub trait Iterator { accum } - // FIXME: #5898: should be called len /// Counts the number of elements in this iterator. /// /// # Example @@ -417,11 +416,11 @@ pub trait Iterator { /// ~~~ {.rust} /// let a = [1, 2, 3, 4, 5]; /// let mut it = a.iter(); - /// assert!(it.len_() == 5); - /// assert!(it.len_() == 0); + /// assert!(it.len() == 5); + /// assert!(it.len() == 0); /// ~~~ #[inline] - fn len_(&mut self) -> uint { + fn len(&mut self) -> uint { self.fold(0, |cnt, _x| cnt + 1) } @@ -1718,9 +1717,9 @@ mod tests { #[test] fn test_iterator_len() { let v = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; - assert_eq!(v.slice(0, 4).iter().len_(), 4); - assert_eq!(v.slice(0, 10).iter().len_(), 10); - assert_eq!(v.slice(0, 0).iter().len_(), 0); + assert_eq!(v.slice(0, 4).iter().len(), 4); + assert_eq!(v.slice(0, 10).iter().len(), 10); + assert_eq!(v.slice(0, 0).iter().len(), 0); } #[test] -- cgit 1.4.1-3-g733a5