diff options
| author | bors <bors@rust-lang.org> | 2019-05-23 07:31:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-23 07:31:24 +0000 |
| commit | f688ba608923bdbf6b46ec65af2f6464b6233a75 (patch) | |
| tree | 3a10abc6d029085f5303852fe878da24b61bdc31 /src/libstd/sys/windows | |
| parent | 85334c50921a1c90707c9d0fb344c63bd373e1b8 (diff) | |
| parent | a89c62ca2b3f019850da20cde89669593e2edf39 (diff) | |
| download | rust-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/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/args.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/args.rs b/src/libstd/sys/windows/args.rs index 744d7ec59d3..b04bb484eed 100644 --- a/src/libstd/sys/windows/args.rs +++ b/src/libstd/sys/windows/args.rs @@ -181,8 +181,6 @@ impl Iterator for Args { type Item = OsString; fn next(&mut self) -> Option<OsString> { self.parsed_args_list.next() } fn size_hint(&self) -> (usize, Option<usize>) { self.parsed_args_list.size_hint() } - #[inline] - fn last(mut self) -> Option<OsString> { self.next_back() } } impl DoubleEndedIterator for Args { |