Skip to content

Commit c287511

Browse files
committed
Fix scala.collection.mutable.LinkedHash{Set,Map}.newBuilder
1 parent 54b2c2f commit c287511

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

project/MiMaFilters.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ object MiMaFilters {
9292
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.TreeMap.empty"),
9393
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.TreeMap.fromSpecific"),
9494
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.ArrayBuilder#ofUnit.addAll"),
95-
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.LinkedHashMap.newBuilder"),
96-
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.LinkedHashSet.newBuilder"),
9795
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.TreeMap.empty"),
9896
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.TreeMap.fromSpecific"),
9997
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.reflect.ManifestFactory#NothingManifest.newArray"),

project/TastyMiMaFilters.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ object TastyMiMaFilters {
115115
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.iterableFactory"),
116116
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.empty"),
117117
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.mapFactory"),
118-
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.mutable.LinkedHash*.newBuilder"),
119118
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.math.Big*.underlying"),
120119
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.immutable.TreeSet.sortedIterableFactory"),
121120
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.View.*PartitionMapped.iterator"),

stdlib-bootstrapped/src/scala/collection/mutable/LinkedHashMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object LinkedHashMap extends MapFactory[LinkedHashMap] {
3232
case _ => Growable.from(empty[K, V], it)
3333
}
3434

35-
def newBuilder[K, V] = new GrowableBuilder(empty[K, V])
35+
def newBuilder[K, V]: GrowableBuilder[(K, V), LinkedHashMap[K, V]] = new GrowableBuilder(empty[K, V])
3636

3737
/** Class for the linked hash map entry, used internally.
3838
*/

stdlib-bootstrapped/src/scala/collection/mutable/LinkedHashSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ object LinkedHashSet extends IterableFactory[LinkedHashSet] {
165165
case _ => Growable.from(empty[E], it)
166166
}
167167

168-
def newBuilder[A] = new GrowableBuilder(empty[A])
168+
def newBuilder[A]: GrowableBuilder[A, LinkedHashSet[A]] = new GrowableBuilder(empty[A])
169169

170170
/** Class for the linked hash set entry, used internally.
171171
*/

0 commit comments

Comments
 (0)