Skip to content
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.

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

RedBlackTree with fast mutable builder #9291

Merged
merged 1 commit into from
Nov 2, 2020

Conversation

retronym
Copy link
Member

@retronym retronym commented Oct 29, 2020

Merging this change forward individually rather than trying to do it as part of a routine 2.12->2.13 merge.

Cherry picked from e9d811e..e6e2e3d / #8794

The various approaches used to maintain serialization compatibility
in 2.12.x can be dropped as they are obviated by use of serialization
proxies in 2.13.x.

Closes scala/scala-dev#733

@scala-jenkins scala-jenkins added this to the 2.13.5 milestone Oct 29, 2020
@SethTisue SethTisue modified the milestones: 2.13.5, 2.13.4 Oct 29, 2020
@retronym retronym force-pushed the merge/rbtree-builder branch 2 times, most recently from bf61aec to 2609de0 Compare October 29, 2020 06:37
@dwijnand dwijnand mentioned this pull request Oct 29, 2020
72 tasks
Cherry picked from  e9d811e..e6e2e3d / scala#8794

The various approaches used to maintain serialization compatibility
in 2.12.x can be dropped as they are obviated by use of serialization
proxies in 2.13.x.
@diesalbla diesalbla added the library:collections PRs involving changes to the standard collection library label Oct 29, 2020
@dwijnand dwijnand merged commit bf73ad9 into scala:2.13.x Nov 2, 2020
@SethTisue SethTisue added the performance the need for speed. usually compiler performance, sometimes runtime performance. label Nov 2, 2020
@lrytz
Copy link
Member

lrytz commented Nov 16, 2020

There are a number of "Note - in 2.13 ..." comments in the diff were overlooked. Probably addressing them will fix scala/bug#12227.

// Note - in 2.13 this should be
// assertEquals(Map("a" -> "2"), r)
// as keys are retained
assertEquals(Map("A" -> "2"), r)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r is in fact ("a" -> "2"), but the test succeeds due to scala/bug#12228

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
library:collections PRs involving changes to the standard collection library performance the need for speed. usually compiler performance, sometimes runtime performance.
Projects
None yet
7 participants