Fix compilation with -Xsource:3

This commit lets scalatest compile with the Scala 2.13 flag `-Xsource:3` (but does not enable the flag in the build), this came up in scala/scala-dev#769. The changes needed were: - Add missing parens when overriding `Iterator#next()` - Remove usages of symbol literal syntax - Remove usages of procedure syntax - Fix code that relied on any2stringadd
smarter · May 3, 2021 · 910a241 · 910a241
1 parent 6ff88d2
commit 910a241
Show file tree

Hide file tree

Showing 15 changed files with 796 additions and 796 deletions.
diff --git a/jvm/common-test/src/main/scala/org/scalatest/prop/Generator.scala b/jvm/common-test/src/main/scala/org/scalatest/prop/Generator.scala
@@ -2355,7 +2355,7 @@ object Generator {
           new Iterator[String] {
             private var nextString = s.take(2)
             def hasNext: Boolean = nextString.length < s.length
-            def next: String = {
+            def next(): String = {
               val result = nextString
               nextString = s.take(result.length * 2)
               result
@@ -2425,7 +2425,7 @@ object Generator {
             new Iterator[List[T]] {
               private var nextT = xs.take(2)
               def hasNext: Boolean = nextT.length < xs.length
-              def next: List[T] = {
+              def next(): List[T] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT
@@ -3839,7 +3839,7 @@ object Generator {
             new Iterator[Vector[T]] {
               private var nextT = xs.take(2)
               def hasNext: Boolean = nextT.length < xs.length
-              def next: Vector[T] = {
+              def next(): Vector[T] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT
@@ -3949,7 +3949,7 @@ object Generator {
             new Iterator[Set[T]] {
               private var nextT = xs.take(2)
               def hasNext: Boolean = nextT.size < xs.size
-              def next: Set[T] = {
+              def next(): Set[T] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT
@@ -4059,7 +4059,7 @@ object Generator {
             new Iterator[SortedSet[T]] {
               private var nextT = xs.take(2)
               def hasNext: Boolean = nextT.size < xs.size
-              def next: SortedSet[T] = {
+              def next(): SortedSet[T] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT
@@ -4174,7 +4174,7 @@ object Generator {
             new Iterator[Map[K, V]] {
               private var nextT = xsList.take(2)
               def hasNext: Boolean = nextT.size < xsList.size
-              def next: Map[K, V] = {
+              def next(): Map[K, V] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT
@@ -4287,7 +4287,7 @@ object Generator {
             new Iterator[SortedMap[K, V]] {
               private var nextT = xs.take(2)
               def hasNext: Boolean = nextT.size < xs.size
-              def next: SortedMap[K, V] = {
+              def next(): SortedMap[K, V] = {
                 if (!hasNext)
                   throw new NoSuchElementException
                 val result = nextT

diff --git a/jvm/core/src/main/scala/org/scalatest/Outcome.scala b/jvm/core/src/main/scala/org/scalatest/Outcome.scala
@@ -223,7 +223,7 @@ object Outcome {
         new Iterator[Throwable] {
           private var spent: Boolean = false
           def hasNext: Boolean = !spent
-          def next: Throwable =
+          def next(): Throwable =
             if (!spent) {
               spent = true
               ex
@@ -232,7 +232,7 @@ object Outcome {
       case _ => // Return an empty iterator
         new Iterator[Throwable] {
           def hasNext: Boolean = false
-          def next: Throwable = throw new NoSuchElementException
+          def next(): Throwable = throw new NoSuchElementException
         }
     }
 }

diff --git a/jvm/core/src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala b/jvm/core/src/main/scala/org/scalatest/tools/SuiteDiscoveryHelper.scala
@@ -317,7 +317,7 @@ private[scalatest] object SuiteDiscoveryHelper {
   private def getFileNamesIteratorFromJar(file: JarFile): Iterator[String] = {
 
     class EnumerationWrapper[T](e: Enumeration[T]) extends Iterator[T] {
-      def next: T = e.nextElement
+      def next(): T = e.nextElement
       def hasNext: Boolean = e.hasMoreElements
     }
 

diff --git a/jvm/diagrams/src/main/scala/org/scalatest/diagrams/Diagrams.scala b/jvm/diagrams/src/main/scala/org/scalatest/diagrams/Diagrams.scala
@@ -357,7 +357,7 @@ object Diagrams extends Diagrams {
       requireNonNull(clue)
       if (!bool.value) {
         val failureMessage =
-          Some(clue + Prettifier.lineSeparator + Prettifier.lineSeparator + renderDiagram(sourceText, bool.anchorValues))
+          Some(clue.toString + Prettifier.lineSeparator + Prettifier.lineSeparator + renderDiagram(sourceText, bool.anchorValues))
         throw newAssertionFailedException(failureMessage, None, pos, Vector.empty)
       }
       Succeeded
@@ -374,7 +374,7 @@ object Diagrams extends Diagrams {
       requireNonNull(clue)
       if (!bool.value) {
         val failureMessage =
-          Some(clue + Prettifier.lineSeparator + Prettifier.lineSeparator + renderDiagram(sourceText, bool.anchorValues))
+          Some(clue.toString + Prettifier.lineSeparator + Prettifier.lineSeparator + renderDiagram(sourceText, bool.anchorValues))
         throw newTestCanceledException(failureMessage, None, pos)
       }
       Succeeded

diff --git a/jvm/matchers-core/src/main/scala/org/scalatest/matchers/dsl/JavaMapWrapper.scala b/jvm/matchers-core/src/main/scala/org/scalatest/matchers/dsl/JavaMapWrapper.scala
@@ -42,7 +42,7 @@ private[scalatest] class JavaMapWrapper[K, V](val underlying: java.util.Map[K, V
     if (underlying.containsKey(key)) Some(underlying.get(key)) else None
   override def iterator: Iterator[(K, V)] = new Iterator[(K, V)] {
     private val javaIterator = underlying.entrySet.iterator
-    def next: (K, V) = {
+    def next(): (K, V) = {
       val nextEntry = javaIterator.next
       (nextEntry.getKey, nextEntry.getValue)
     }

diff --git a/jvm/scalactic-test/src/test/scala/org/scalactic/PrettifierSpec.scala b/jvm/scalactic-test/src/test/scala/org/scalactic/PrettifierSpec.scala
@@ -380,7 +380,7 @@ class PrettifierSpec extends funspec.AnyFunSpec with matchers.should.Matchers {
         def iterator: Iterator[Fred] =
           new Iterator[Fred] {
             private var hasNextElement: Boolean = true
-            def next: Fred = {
+            def next(): Fred = {
               if (hasNextElement) {
                 hasNextElement = false
                 thisFred