Skip to content
This repository was archived by the owner on Dec 22, 2021. It is now read-only.

Dotty #4013 #517

Closed
wants to merge 2 commits into from
Closed

Dotty #4013 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27e5f0
Remove self type from object
allanrenucci Mar 19, 2018
0d638e7
Bump Dotty version
allanrenucci Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala
jdk: oraclejdk8
script:
- sbt ++2.12.4 memoryBenchmark/compile test ++2.13.0-M2 timeBenchmark/compile test ++0.7.0-RC1 test
- sbt ++2.12.4 memoryBenchmark/compile test ++2.13.0-M2 timeBenchmark/compile test ++0.8.0-bin-20180317-b499a9a-NIGHTLY test
- sbt ++2.13.0-M2 collections-contribJVM/test junit/test scalacheck/test
- sbt ++2.12.4 collectionsJS/test ++2.13.0-M2 collectionsJS/test collections-contribJS/test
before_script:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.scalajs.sbtplugin.cross.CrossProject

// Convenient setting that allows writing `set scalaVersion := dotty.value` in sbt shell to switch from Scala to Dotty
val dotty = settingKey[String]("dotty version")
dotty in ThisBuild := "0.7.0-RC1"
dotty in ThisBuild := "0.8.0-bin-20180317-b499a9a-NIGHTLY"

val collectionsScalaVersionSettings = Seq(
scalaVersion := "2.13.0-M2",
Expand Down
4 changes: 2 additions & 2 deletions collections/src/main/scala/strawman/collection/immutable/ImmutableArray.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ sealed abstract class ImmutableArray[+A]
* @define coll immutable array
* @define Coll `ImmutableArray`
*/
object ImmutableArray extends StrictOptimizedClassTagSeqFactory[ImmutableArray] { self =>
val untagged: SeqFactory[ImmutableArray] = new ClassTagSeqFactory.AnySeqDelegate(self)
object ImmutableArray extends StrictOptimizedClassTagSeqFactory[ImmutableArray] {
val untagged: SeqFactory[ImmutableArray] = new ClassTagSeqFactory.AnySeqDelegate(this)
Copy link
Contributor

@szeiger szeiger Mar 20, 2018

Choose a reason for hiding this comment

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

What's the reason for these changes? Just removing some unnecessary code, or is there a change in Dotty that necessitates this?

Copy link
Contributor Author

@allanrenucci allanrenucci Mar 20, 2018

Choose a reason for hiding this comment

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

We recently disallowed named self in scala/scala3#4118. We might reconsider it though

Copy link
Contributor

@odersky odersky Mar 22, 2018

Choose a reason for hiding this comment

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

But the fix refers to the wrong this! Btw we will revert #4118.


private[this] lazy val emptyImpl = new ImmutableArray.ofRef[Nothing](new Array[Nothing](0))

Expand Down
4 changes: 2 additions & 2 deletions collections/src/main/scala/strawman/collection/mutable/UnrolledBuffer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ sealed class UnrolledBuffer[T](implicit val tag: ClassTag[T])
}


object UnrolledBuffer extends StrictOptimizedClassTagSeqFactory[UnrolledBuffer] { self =>
object UnrolledBuffer extends StrictOptimizedClassTagSeqFactory[UnrolledBuffer] {

val untagged: SeqFactory[UnrolledBuffer] = new ClassTagSeqFactory.AnySeqDelegate(self)
val untagged: SeqFactory[UnrolledBuffer] = new ClassTagSeqFactory.AnySeqDelegate(this)

def empty[A : ClassTag]: UnrolledBuffer[A] = new UnrolledBuffer[A]

Expand Down
4 changes: 2 additions & 2 deletions collections/src/main/scala/strawman/collection/mutable/WrappedArray.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ abstract class WrappedArray[T]

/** A companion object used to create instances of `WrappedArray`.
*/
object WrappedArray extends StrictOptimizedClassTagSeqFactory[WrappedArray] { self =>
val untagged: SeqFactory[WrappedArray] = new ClassTagSeqFactory.AnySeqDelegate(self)
object WrappedArray extends StrictOptimizedClassTagSeqFactory[WrappedArray] {
val untagged: SeqFactory[WrappedArray] = new ClassTagSeqFactory.AnySeqDelegate(this)

// This is reused for all calls to empty.
private val EmptyWrappedArray = new ofRef[AnyRef](new Array[AnyRef](0))
Expand Down