Skip to content

Commit 2878b60

Browse files
committed
fix dotty warnings
1 parent 43db6f0 commit 2878b60

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ libraryDependencies ++= Seq(
3636
"org.scalatest" %% "scalatest" % "3.1.1",
3737
"junit" % "junit" % "4.12"
3838
)
39+
Test / scalacOptions ++= (if (isDotty.value) Seq("-language:implicitConversions") else Nil)
3940

4041
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
4142
import scala.xml.transform.{RewriteRule, RuleTransformer}

src/main/scala/org/scalatestplus/junit/JUnitHelper.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.scalatest.{Suite, TagAnnotation}
2323
private[junit] object JUnitHelper {
2424

2525
def mergeMap[A, B](ms: List[Map[A, B]])(f: (B, B) => B): Map[A, B] =
26-
(Map[A, B]() /: (for (m <- ms; kv <- m) yield kv)) { (a, kv) =>
26+
(for (m <- ms; kv <- m) yield kv).foldLeft(Map[A, B]()) { (a, kv) =>
2727
a + (if (a.contains(kv._1)) kv._1 -> f(a(kv._1), kv._2) else kv)
2828
}
2929

src/test/scala/org/scalatestplus/junit/JUnitSuiteSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616
package org.scalatestplus.junit {
1717

18-
import org.scalatest._
18+
import org.scalatest._
1919
import org.scalatest.events._
2020

2121
// Put fixture suites in a subpackage, so they won't be discovered by
2222
// -m org.scalatest.junit when running the test target for this project.
2323
package helpers {
2424

2525
import _root_.org.junit.Ignore
26-
import _root_.org.junit.Test
26+
import _root_.org.junit.Test
2727

2828
class HappySuite extends JUnitSuite {
2929

0 commit comments

Comments
 (0)