about summary refs log tree commit diff
path: root/src/liballoc/string.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-23 07:31:24 +0000
committerbors <bors@rust-lang.org>2019-05-23 07:31:24 +0000
commitf688ba608923bdbf6b46ec65af2f6464b6233a75 (patch)
tree3a10abc6d029085f5303852fe878da24b61bdc31 /src/liballoc/string.rs
parent85334c50921a1c90707c9d0fb344c63bd373e1b8 (diff)
parenta89c62ca2b3f019850da20cde89669593e2edf39 (diff)
downloadrust-f688ba608923bdbf6b46ec65af2f6464b6233a75.tar.gz
rust-f688ba608923bdbf6b46ec65af2f6464b6233a75.zip
Auto merge of #61075 - Centril:rollup-1ugmcqu, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #60981 (Bump compiler-builtins to 0.1.15)
 - #61014 (Make -Zemit-artifact-notifications also emit the artifact type)
 - #61043 (Disable LLVM/debug assertions in gnu-full-bootstrap)
 - #61046 (Fix ICE with inconsistent macro matchers)
 - #61055 (Solaris CI: Build with dilos2 stable)
 - #61057 (Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators.")
 - #61073 (librustc_errors: Remove unused annotation style `OldSchoolNoteText`)

Failed merges:

r? @ghost
Diffstat (limited to 'src/liballoc/string.rs')
-rw-r--r--src/liballoc/string.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index e74d37c1c2b..7f7722548f5 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -2385,10 +2385,6 @@ impl Iterator for Drain<'_> {
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.iter.size_hint()
     }
-    #[inline]
-    fn last(mut self) -> Option<char> {
-        self.next_back()
-    }
 }
 
 #[stable(feature = "drain", since = "1.6.0")]