Skip to content

Commit 588ee18

Browse files
committed
Cleanup
1 parent 655dc31 commit 588ee18

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
@@ -3491,28 +3491,26 @@ object Types {
34913491
*/
34923492
private def gatherTreeUniqueMembersAbsorbingNothingTypes(using Context): MutableSet[Type] = {
34933493

3494-
var trees = List(this)
3494+
var unvisitedSubtrees = List(this)
34953495
val uniqueTreeMembers = new EqLinkedHashSet[Type]
34963496

3497-
while (trees.nonEmpty) {
3498-
trees match {
3497+
while (unvisitedSubtrees.nonEmpty) {
3498+
unvisitedSubtrees match
34993499
case head :: tail =>
3500-
head match {
3500+
head match
35013501
case OrType(l: OrType, r: OrType) =>
3502-
trees = l :: r :: tail
3502+
unvisitedSubtrees = l :: r :: tail
35033503
case OrType(l, r: OrType) =>
3504-
trees = r :: tail
3504+
unvisitedSubtrees = r :: tail
35053505
if !l.isNothingType then uniqueTreeMembers += l
35063506
case OrType(l: OrType, r) =>
3507-
trees = l :: tail
3507+
unvisitedSubtrees = l :: tail
35083508
if !r.isNothingType then uniqueTreeMembers += r
35093509
case OrType(l, r) =>
3510-
trees = tail
3510+
unvisitedSubtrees = tail
35113511
uniqueTreeMembers += l
35123512
if !r.isNothingType then uniqueTreeMembers += r
3513-
}
35143513
case _ =>
3515-
}
35163514
}
35173515

35183516
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)