Skip to content

Commit a389e79

Browse files
bishaboshacheeseng
authored andcommitted
remove dotty-specific factory conversions
1 parent d8a0826 commit a389e79

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

project/GenColCompatHelper.scala

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ object GenColCompatHelper {
5353
|
5454
| type Factory[-A, +C] = scala.collection.Factory[A, C]
5555
|
56-
| object Factory {
57-
| $$DOTTY_CONVERSION_METHODS$$
58-
| }
56+
| object Factory {}
5957
|
6058
| def className(col: scala.collection.Iterable[_]): String = {
6159
| val colToString = col.toString
@@ -71,10 +69,7 @@ object GenColCompatHelper {
7169
| type StringOps = scala.collection.StringOps
7270
|}
7371
|
74-
""".replaceAllLiterally(
75-
"$$DOTTY_CONVERSION_METHODS$$",
76-
if (ScalaVersionHelper.isDotty(scalaVersion)) dottyColCompatHelperFactoryMethods else "")
77-
.stripMargin
72+
""".stripMargin
7873
else
7974
"""/*
8075
| * Copyright 2001-2018 Artima, Inc.
@@ -142,20 +137,6 @@ object GenColCompatHelper {
142137
)
143138
}
144139

145-
private def dottyColCompatHelperFactoryMethods: String = """
146-
| implicit def mkFactoryFromList[A]: Conversion[scala.collection.immutable.List.type, scala.collection.Factory[A, scala.collection.immutable.List[A]]] =
147-
| scala.collection.IterableFactory.toFactory(_)
148-
|
149-
| implicit def mkFactoryFromVector[A]: Conversion[scala.collection.immutable.Vector.type, scala.collection.Factory[A, scala.collection.immutable.Vector[A]]] =
150-
| scala.collection.IterableFactory.toFactory(_)
151-
|
152-
| implicit def mkFactoryFromSet[A]: Conversion[scala.collection.immutable.Set.type, scala.collection.Factory[A, scala.collection.immutable.Set[A]]] =
153-
| scala.collection.IterableFactory.toFactory(_)
154-
|
155-
| implicit def mkFactoryFromListBuffer[A]: Conversion[scala.collection.mutable.ListBuffer.type, scala.collection.Factory[A, scala.collection.mutable.ListBuffer[A]]] =
156-
| scala.collection.IterableFactory.toFactory(_)
157-
""".stripMargin
158-
159140
def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
160141
val chainSpec =
161142
if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))

0 commit comments

Comments
 (0)