about summary refs log tree commit diff
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-09 20:25:45 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-10 07:33:21 -0700
commit74d2552b0ab671a7455b5a60972c0cc6e3ecdb82 (patch)
treed5945d71ced7225ef122a65e895cd6247c22851b
parent1db62d8311cba10c9f5f2ce38543fec7dad5b9c9 (diff)
downloadrust-74d2552b0ab671a7455b5a60972c0cc6e3ecdb82.tar.gz
rust-74d2552b0ab671a7455b5a60972c0cc6e3ecdb82.zip
std: Iterator.last_ -> .last
-rw-r--r--src/libstd/iterator.rs7
1 files 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<A> {
     /// 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<A> {
+    fn last(&mut self) -> Option<A> {
         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]