From 74d2552b0ab671a7455b5a60972c0cc6e3ecdb82 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Fri, 9 Aug 2013 20:25:45 -0700 Subject: [PATCH] std: Iterator.last_ -> .last --- src/libstd/iterator.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libstd/iterator.rs b/src/libstd/iterator.rs index 944b568db3f..811adb53cb4 100644 --- a/src/libstd/iterator.rs +++ b/src/libstd/iterator.rs @@ -381,9 +381,8 @@ pub trait Iterator { /// let a = [1, 2, 3, 4, 5]; /// assert!(a.iter().last().get() == &5); /// ~~~ - // FIXME: #5898: should be called `last` #[inline] - fn last_(&mut self) -> Option { + fn last(&mut self) -> Option { let mut last = None; for x in *self { last = Some(x); } last @@ -1712,8 +1711,8 @@ mod tests { #[test] fn test_iterator_last() { let v = &[0, 1, 2, 3, 4]; - assert_eq!(v.iter().last_().unwrap(), &4); - assert_eq!(v.slice(0, 1).iter().last_().unwrap(), &0); + assert_eq!(v.iter().last().unwrap(), &4); + assert_eq!(v.slice(0, 1).iter().last().unwrap(), &0); } #[test]