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.

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

Jump to bottom

Re-work 2.13 collections changes #210

Merged
merged 4 commits into from
Apr 18, 2018
Merged

Re-work 2.13 collections changes #210

merged 4 commits into from
Apr 18, 2018

Conversation

ashawley
Copy link
Member

While verifying the #202 changes were binary compatible, I went and rebased and then re-worked the first changes from Lukas for the latest 2.13.x collections. The result is a more minimal changeset, fwiw.

  1. Use import statements for scala.collection.Seq instead of search-and-replace,
  2. preserve mutable.Map,
  3. use StringBuilder.setLength instead of StringBuilder.clear

@ashawley
Copy link
Member Author

I've also rebased the working branch Lukas pushed to https://github.com/scala/scala-xml/tree/newCollectionsBootstrap onto this rebased branch and pushed it to my fork:

ashawley/scala-xml@2.13-collections...newCollectionsBootstrap

lrytz
lrytz approved these changes Apr 17, 2018
View reviewed changes
Copy link
Member

@lrytz lrytz left a comment

Choose a reason for hiding this comment

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

Thanks!

@lrytz
Copy link
Member

lrytz commented Apr 17, 2018

Adding the rest of the commits in newCollectionsBootstrap is blocked by not having scala-js. We'll see if we get a scala-js for 2.13.0-M4-pre-a68f6d5, otherwise we'll hopefully have it soon after 2.13.0-M4 is out.

lrytz and others added 4 commits April 17, 2018 20:18
@lrytz @ashawley
Seq => collection.Seq
562ea83 
Preserve for binary compatability.
Scala 2.13 collections rewrite defaults to immutable.Seq.
@ashawley
Convert BitSet.toSet
59dd742 
Fix compiler error with Scala 2.13 collections rewrite:

ambiguous reference to overloaded definition,
both method map in trait StrictOptimizedIterableOps of type [B](f: Int => B)scala.collection.immutable.Set[B]
and  method map in trait SortedSetOps of type [B](f: Int => B)(implicit evidence$4: Ordering[B])scala.collection.immutable.SortedSet[B]
match argument types (Int => scala.collection.immutable.BitSet)
    (Q map f).foldLeft(immutable.BitSet.empty)(_ ++ _)
       ^
@ashawley
Use immutable.Map and val
b133117 
Compiler complains after Scala 2.13 collections rewrite that

value updated is not a member of scala.collection.Map
@ashawley
Use StringBuilder.setLength
4d1d67a 
Compiler complains with new Scala 2.13 collection

reassignment to val
    cbuf.length = 0
                ^
@ashawley ashawley merged commit e02c2be into scala:master Apr 18, 2018
@ashawley ashawley deleted the 2.13-collections branch April 18, 2018 00:41
@ashawley ashawley mentioned this pull request Apr 18, 2018
Closed
@ashawley
Copy link
Member Author

I've rebased master and push-forced on to the WIPnewCollectionsBootstrap branch. The tag v1.1.0-newCollectionsBootstrap still has the old commits of Lukas's original work.

@ashawley ashawley mentioned this pull request May 18, 2018
Closed
@SethTisue
Copy link
Member

what's the path forward to getting newCollectionsBootstrap merged onto master..? is there anything we should be discussing?

@ashawley ashawley mentioned this pull request Aug 21, 2018
Closed
@SethTisue
Copy link
Member

(the merge onto master is in process at #260)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lrytz lrytz lrytz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ashawley @lrytz @SethTisue