[11041] Deprecate .zipped method on tuples #7025
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[11041] Deprecate Tuple2Zipped, Tuple3Zipped, ZippedIterable2, ZippedIterable3 [11041] Replace usages of .zipped with .lazyZip [11041] Replace usages of .zipped (3 way) with .lazyZip.lazyZip
joshlemer
force-pushed
the
issue/11041-2.13
branch
from
b569aa7
to
3e7d0af
Compare
julienrf
reviewed
Aug 9, 2018
| @@ -303,7 +303,7 @@ trait MatchApproximation extends TreeAndTypeAnalysis with ScalaLogic with MatchT | |||
| // debug.patmat ("normalize subst: "+ normalize) | |||
|
|
|||
| val okSubst = Substitution(unboundFrom.toList, unboundTo.toList) // it's important substitution does not duplicate trees here -- it helps to keep hash consing simple, anyway | |||
| pointsToBound ++= ((okSubst.from, okSubst.to).zipped filter { (f, t) => pointsToBound exists (sym => t.exists(_.symbol == sym)) })._1 | |||
| pointsToBound ++= okSubst.from.lazyZip(okSubst.to).collect { case (f, t) if pointsToBound.exists(sym => t.exists(_.symbol == sym)) => f } | |||
There was a problem hiding this comment.
Why replacing filter with collect?
There was a problem hiding this comment.
The original code is filtering and then at the end, takes only the left iterable. I took liberty of replacing it with a collect which just collects the left elements when the predicate holds.
| @@ -25,7 +25,7 @@ class ArraySortingTest { | |||
| java.util.Arrays.sort(test) | |||
| scala.util.Sorting.quickSort(cant)(CanOrder) | |||
| assert( test(6) == 1 ) | |||
| assert( (test,cant).zipped.forall(_ == _.i) ) | |||
| assert( test.toIterable.lazyZip(cant).forall(_ == _.i) ) | |||
There was a problem hiding this comment.
We should add lazyZip to ArrayOps so that users don’t have to convert it to an Iterable. We could do the same with StringOps, btw. I’ve created scala/bug#11063 for that. You don’t have to do it in that PR.
|
thank you Josh! |
SethTisue
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes scala/bug#11041