Skip to content

[3.1] Remove erroneous drop(while:) optimization #8141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tkremenek merged 2 commits into from
Apr 7, 2017
Merged

[3.1] Remove erroneous drop(while:) optimization #8141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b151af6
Remove erroneous drop(while:) optimization
CodaFi Mar 14, 2017
af78c29
Update prefix-drop regression test (#8194)
CodaFi Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions stdlib/public/core/Sequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,14 +725,6 @@ internal class _PrefixSequence<Base : IteratorProtocol>
maxLength: Swift.min(maxLength, self._maxLength),
taken: _taken))
}

internal func drop(
while predicate: (Base.Element) throws -> Bool
) rethrows -> AnySequence<Base.Element> {
return try AnySequence(
_DropWhileSequence(
iterator: _iterator, nextElement: nil, predicate: predicate))
}
}

/// A sequence that lazily consumes and drops `n` elements from an underlying
Expand Down
5 changes: 5 additions & 0 deletions validation-test/stdlib/SequenceType.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,11 @@ SequenceTypeTests.test("prefix/dispatch") {
expectCustomizable(tester, tester.log.prefixMaxLength)
}

SequenceTypeTests.test("prefix/drop/dispatch") {
let xs = sequence(first: 1, next: {$0 < 10 ? $0 + 1 : nil})
expectEqualSequence([], Array(xs.prefix(3).drop(while: {$0 < 7})))
}

//===----------------------------------------------------------------------===//
// prefix(while:)
//===----------------------------------------------------------------------===//
Expand Down