Merge 2.12 to 2.13 #9084
Merged
Merge 2.12 to 2.13 #9084
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
The test suite that aimed to bring all of our sets and maps into
line did not exercise code paths optimized for:
collection.$op(collectionOfSameType)
This commit updates the test to:
- add test variants that generate operands of the same type as the
input collection
- add "preserves identity" tests for set intersection
- fix the resulting failures by flipping the operands
in `RedBlackTree.{union,intersection}`
I've also added concrete test cases to `Tree{Map,Set}Test` that
are easier to review and that also exercise builders.
[backport] Bulk ops on TreeSet, TreeMap prefer keys from the left
... when the operand overwrites mapping with a key that is == but ne.
This is consistent with the super class implementation, which
was overridden in 2.12.11 for efficiency.
I also found a pair of ClassCastExceptions in the new implementations
of `HashMap.++:`, for instance:
```
case class C(a: Int)(override val toString: String); implicit val Ordering_C: Ordering[C] = Ordering.by(_.a); val c0l = C(0)("l"); val c0r = C(0)("r"); import collection.immutable._; println(HashMap((c0l, ())).++:(TreeMap((c0r, ()))))'; done
v2.12.10
Map(r -> ())
v2.12.11
java.lang.ClassCastException: scala.collection.immutable.HashMap$adder$1$ cannot be cast to scala.collection.immutable.HashMap
at scala.collection.immutable.HashMap$adder$1$.<init>(HashMap.scala:215)
```
We need to favour keys from the left that equivalent (but ne), while favouring values from the right. (cherry picked from commit abd82a2)
[backport] Rework recent, buggy change to immutable.TreeMap
HashMap bulk operations should retain existing keys
lrytz
force-pushed
the
merge-2.12-to-2.13-jun-24
branch
from
64c3ad0
to
223c359
Compare
SethTisue
added
the
prio:blocker
SethTisue
removed
the
prio:blocker
|
We need to re-run the community build anyway because of the reflection thread-safety fix, and it seems a shame to leave the #12054 fix (which Lukas put in the merge commit) out of 2.13.3 when it's so similar to all the other |
|
/nothingtoseehere |
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.
The new test uncovered a bug in the deprecated
++:method, which is fixed in the merge commit (fixes scala/bug#12054).