Skip to content

Commit 88a1c3e

Browse files
committed
fix more tests
1 parent 13b8bb6 commit 88a1c3e

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

tests/run/enum-custom-toString.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enum EJ extends java.lang.Enum[EJ]:
66
case B
77
override def toString: String = "overridden"
88

9-
trait Mixin extends Enum:
9+
trait Mixin extends reflect.Enum:
1010
override def productPrefix: String = "noprefix"
1111
override def toString: String = "overridden"
1212

@@ -36,7 +36,7 @@ enum EQ:
3636
case J extends EQ with Mixin
3737
case K(arg: Int) extends EQ with Mixin
3838

39-
abstract class Tag[T] extends Enum
39+
abstract class Tag[T] extends reflect.Enum
4040
object Tag:
4141
private final class IntTagImpl extends Tag[Int] with runtime.EnumValue:
4242
def ordinal = 0

tests/run/generic/Color.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Shapes._
88
* case Blue
99
* }
1010
*/
11-
sealed trait Color extends Enum
11+
sealed trait Color extends EnumLike
1212

1313
object Color {
1414

tests/run/generic/Enum.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package generic
22

3-
trait Enum {
3+
trait EnumLike {
44
def ordinal: Int
55
}
66

77
object runtime {
8-
class EnumValues[E <: Enum] {
8+
class EnumValues[E <: EnumLike] {
99
private[this] var myMap: Map[Int, E] = Map()
1010
private[this] var fromNameCache: Map[String, E] = null
1111

tests/run/generic/List.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Shapes._
77
* case Nil()
88
* }
99
*/
10-
sealed trait List0[T] extends Enum
10+
sealed trait List0[T] extends EnumLike
1111
object List0 {
1212
abstract case class Cons[T](hd: T, tl: List0[T]) extends List0[T] {
1313
def ordinal = 0
@@ -51,7 +51,7 @@ object List0 {
5151
* case Nil extends List[Nothing]
5252
* }
5353
*/
54-
sealed trait List[+T] extends Enum
54+
sealed trait List[+T] extends EnumLike
5555
object List {
5656
abstract case class Cons[T](hd: T, tl: List[T]) extends List[T] {
5757
def ordinal = 0

tests/run/generic/SearchResult.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Shapes._
99
* case Ambiguous(alt1: SearchResult, alt2: SearchResult)
1010
* }
1111
*/
12-
sealed trait SearchResult extends Enum
12+
sealed trait SearchResult extends EnumLike
1313

1414
object SearchResult {
1515

tests/run/generic/Test.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ object Test {
6969
sds(data4)
7070
assert(sCount == 1, sCount)
7171
}
72-
}
72+
}

tests/run/generic/Tree.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Shapes._
1212
* case If(cond: Boolean, thenp: Tree[T], elsep: Tree[T])
1313
* }
1414
*/
15-
sealed trait Tree[TR] extends Enum
15+
sealed trait Tree[TR] extends EnumLike
1616

1717
object Tree {
1818

0 commit comments

Comments
 (0)