Skip to content

Commit d7006e1

Browse files
committed
Cleanup
1 parent 329e1ad commit d7006e1

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3475,28 +3475,26 @@ object Types {
34753475
*/
34763476
private def gatherTreeUniqueMembersAbsorbingNothingTypes(using Context): MutableSet[Type] = {
34773477

3478-
var trees = List(this)
3478+
var unvisitedSubtrees = List(this)
34793479
val uniqueTreeMembers = new EqLinkedHashSet[Type]
34803480

3481-
while (trees.nonEmpty) {
3482-
trees match {
3481+
while (unvisitedSubtrees.nonEmpty) {
3482+
unvisitedSubtrees match
34833483
case head :: tail =>
3484-
head match {
3484+
head match
34853485
case OrType(l: OrType, r: OrType) =>
3486-
trees = l :: r :: tail
3486+
unvisitedSubtrees = l :: r :: tail
34873487
case OrType(l, r: OrType) =>
3488-
trees = r :: tail
3488+
unvisitedSubtrees = r :: tail
34893489
if !l.isNothingType then uniqueTreeMembers += l
34903490
case OrType(l: OrType, r) =>
3491-
trees = l :: tail
3491+
unvisitedSubtrees = l :: tail
34923492
if !r.isNothingType then uniqueTreeMembers += r
34933493
case OrType(l, r) =>
3494-
trees = tail
3494+
unvisitedSubtrees = tail
34953495
uniqueTreeMembers += l
34963496
if !r.isNothingType then uniqueTreeMembers += r
3497-
}
34983497
case _ =>
3499-
}
35003498
}
35013499

35023500
uniqueTreeMembers

compiler/src/dotty/tools/dotc/util/EqLinkedHashSet.scala

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,3 @@ class EqLinkedHashSet[T](
3232
override def iterator: Iterator[T] = linkingArray.iterator
3333

3434
}
35-
36-
object EqLinkedHashSet {
37-
def apply[T](x: T): EqLinkedHashSet[T] =
38-
val set = new EqLinkedHashSet[T]
39-
set += x
40-
set
41-
42-
def apply[T](x: T, y: T): EqLinkedHashSet[T] =
43-
val set = EqLinkedHashSet(x)
44-
set += y
45-
set
46-
}

0 commit comments

Comments
 (0)