Simplify the implementation of IntoIter::last() a bit.

Suggested by @pickfire. Signed-off-by: Hanif Bin Ariffin <[email protected]>
rust-lang · Oct 23, 2020 · 91984e7 · 91984e7
1 parent a9919e0
commit 91984e7
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/library/alloc/src/vec.rs b/library/alloc/src/vec.rs
@@ -2955,24 +2955,11 @@ impl<T> Iterator for IntoIter<T> {
         unsafe {
             if mem::size_of::<T>() == 0 { mem::zeroed() } else { ptr::read(self.ptr.add(i)) }
         }
+    }
+
     #[inline]
     fn last(mut self) -> Option<T> {
-        unsafe {
-            if self.ptr as *const _ == self.end {
-                None
-            } else {
-                if mem::size_of::<T>() == 0 {
-                    // Immediately marches to end of the iterator.
-                    self.ptr = self.end;
-                    // Make up a value of this ZST.
-                    Some(mem::zeroed())
-                } else {
-                    // Immediately marches to end of the iterator.
-                    self.ptr = self.end;
-                    Some(ptr::read(self.ptr.offset(-1)))
-                }
-            }
-        }
+        self.next_back()
     }
 }