Skip to content

Commit d1f6029

Browse files
committed
Fix scala.collection.[im]mutable.BitSet.bitSetFactory
1 parent 28e9306 commit d1f6029

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

project/MiMaFilters.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,12 @@ object MiMaFilters {
106106
Seq( // DirectMissingMethodProblem
107107
"scala.collection.convert.JavaCollectionWrappers#*.iterableFactory", "scala.collection.convert.JavaCollectionWrappers#*.mapFactory", "scala.collection.convert.JavaCollectionWrappers#IteratorWrapper.remove",
108108
"scala.collection.immutable.ArraySeq#*.elemTag",
109-
"scala.collection.immutable.BitSet.bitSetFactory",
110109
"scala.collection.immutable.HashCollisionSetNode.copy",
111110
"scala.collection.immutable.MapKeyValueTupleHashIterator.next",
112111
"scala.collection.immutable.TreeSet.sortedIterableFactory",
113112
"scala.collection.LinearSeqIterator#LazyCell.this",
114113
"scala.collection.mutable.AnyRefMap#ToBuildFrom.newBuilder",
115114
"scala.collection.mutable.ArraySeq#*.elemTag",
116-
"scala.collection.mutable.BitSet.bitSetFactory",
117115
"scala.collection.mutable.LinkedHashMap.newBuilder", "scala.collection.mutable.LinkedHashSet.newBuilder",
118116
"scala.collection.mutable.LongMap#ToBuildFrom.newBuilder",
119117
"scala.collection.mutable.PriorityQueue#ResizableArrayAccess.this",

project/TastyMiMaFilters.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ object TastyMiMaFilters {
1111
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.*$extension"),
1212
ProblemMatcher.make(ProblemKind.IncompatibleSelfTypeChange, "scala.*"),
1313

14+
// Probably OK: object singleton type
15+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.mutable.BitSet.bitSetFactory"),
16+
1417
// Probably OK: by-name arguments in signatures
1518
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.App.delayedInit"),
1619
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.Array.fill"),
@@ -115,8 +118,6 @@ object TastyMiMaFilters {
115118
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.mutable.LinkedHash*.newBuilder"),
116119
ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.math.Big*.underlying"),
117120
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.immutable.TreeSet.sortedIterableFactory"),
118-
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.immutable.BitSet.bitSetFactory"),
119-
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.mutable.BitSet.bitSetFactory"),
120121
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.View.*PartitionMapped.iterator"),
121122
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.sys.process.ProcessBuilderImpl.*.toSink"),
122123
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.sys.process.ProcessBuilderImpl.*.toSource"),

stdlib-bootstrapped/src/scala/collection/immutable/BitSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sealed abstract class BitSet
4141
override protected def newSpecificBuilder: Builder[Int, BitSet] = bitSetFactory.newBuilder
4242
override def empty: BitSet = bitSetFactory.empty
4343

44-
def bitSetFactory = BitSet
44+
def bitSetFactory: BitSet.type = BitSet
4545

4646
protected[collection] def fromBitMaskNoCopy(elems: Array[Long]): BitSet = BitSet.fromBitMaskNoCopy(elems)
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class BitSet(protected[collection] final var elems: Array[Long])
5151
override protected def newSpecificBuilder: Builder[Int, BitSet] = bitSetFactory.newBuilder
5252
override def empty: BitSet = bitSetFactory.empty
5353

54-
def bitSetFactory = BitSet
54+
def bitSetFactory: BitSet.type = BitSet
5555

5656
override def unsorted: Set[Int] = this
5757

0 commit comments

Comments
 (0)