Skip to content

SI-9737 [no-merge] Backport stringOf ParIterable#5213

Merged
retronym merged 1 commit intoscala:2.11.xfrom
som-snytt:issue/stringof-pariterable
Jun 14, 2016
Merged

SI-9737 [no-merge] Backport stringOf ParIterable#5213
retronym merged 1 commit intoscala:2.11.xfrom
som-snytt:issue/stringof-pariterable

Conversation

@som-snytt
Copy link
Contributor

Cherry-picked c5f3d3f

Edited comment: in stringOf, let GenIterable subsume
both Iterable and ParIterable.

This change is required for Scala.js compatibility as it does not
support parallel collections.

Conflicts:

src/library/scala/runtime/ScalaRunTime.scala

Cherry-picked c5f3d3f

Edited comment: in stringOf, let GenIterable subsume
both Iterable and ParIterable.

This change is required for Scala.js compatibility as it does not
support parallel collections.

Conflicts:

	src/library/scala/runtime/ScalaRunTime.scala
@scala-jenkins scala-jenkins added this to the 2.11.9 milestone Jun 3, 2016
@som-snytt
Copy link
Contributor Author

I normally prefer dotless infix, but I was tempted to re-dot the changed line and neighboring lines, so now I'm swinging more as Odersky recommends. Which kind of makes me feel like an old fogey, but I have to be honest with myself.

@retronym
Copy link
Member

LGTM

@retronym retronym merged commit ab06ce8 into scala:2.11.x Jun 14, 2016
@som-snytt som-snytt deleted the issue/stringof-pariterable branch July 24, 2016 19:53
@SethTisue SethTisue modified the milestones: 2.11.11, 2.11.9 May 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants