Skip to content

Commit dd42488

Browse files
committed
remove scala.Enum type alias
1 parent aaec84d commit dd42488

File tree

7 files changed

+11
-17
lines changed

7 files changed

+11
-17
lines changed

docs/docs/reference/enums/enums.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ object Planet {
8989
```
9090

9191
### Compatibility with Java Enums
92-
If you want to use the Scala-defined enums as Java enums, you can do so by extending `java.lang.Enum` class as follows:
92+
If you want to use the Scala-defined enums as Java enums, you can do so by extending
93+
the class `java.lang.Enum`, which is imported by default, as follows:
9394

9495
```scala
95-
enum Color extends java.lang.Enum[Color] { case Red, Green, Blue }
96+
enum Color extends Enum[Color] { case Red, Green, Blue }
9697
```
9798

9899
The type parameter comes from the Java enum [definition](https://docs.oracle.com/javase/8/docs/api/index.html?java/lang/Enum.html) and should be the same as the type of the enum.

library/src/scala/Enum.scala

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/pos/enum-companion-first.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Planet:
22
final val G = 6.67300E-11
33

4-
enum Planet(mass: Double, radius: Double) extends java.lang.Enum[Planet]:
4+
enum Planet(mass: Double, radius: Double) extends Enum[Planet]:
55
def surfaceGravity = Planet.G * mass / (radius * radius)
66
def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity
77

tests/pos/t7716.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Test {
22
def test: Unit = {
3-
val e: java.lang.Enum[_] = java.util.concurrent.TimeUnit.SECONDS
3+
val e: Enum[_] = java.util.concurrent.TimeUnit.SECONDS
44
e match { case x => println(x) }
55

66

tests/semanticdb/expect/Enums.expect.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ object Enums/*<-_empty_::Enums.*/:
5454

5555
val some1/*<-_empty_::Enums.some1.*/ = /*->_empty_::Enums.unwrap().*/Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1))/*->_empty_::Enums.`<:<`.given_T().*/.unwrap
5656

57-
enum Planet/*<-_empty_::Enums.Planet#*/(mass/*<-_empty_::Enums.Planet#mass.*/: Double/*->scala::Double#*/, radius/*<-_empty_::Enums.Planet#radius.*/: Double/*->scala::Double#*/) extends java.lang.Enum/*->java::lang::Enum#*/[Planet/*->_empty_::Enums.Planet#*/]/*->java::lang::Enum#`<init>`().*/:
57+
enum Planet/*<-_empty_::Enums.Planet#*/(mass/*<-_empty_::Enums.Planet#mass.*/: Double/*->scala::Double#*/, radius/*<-_empty_::Enums.Planet#radius.*/: Double/*->scala::Double#*/) extends Enum/*->java::lang::Enum#*/[Planet/*->_empty_::Enums.Planet#*/]/*->java::lang::Enum#`<init>`().*/:
5858
private final val G/*<-_empty_::Enums.Planet#G.*/ = 6.67300E-11
5959
def surfaceGravity/*<-_empty_::Enums.Planet#surfaceGravity().*/ = G/*->_empty_::Enums.Planet#G.*/ */*->scala::Double#`*`(+6).*/ mass/*->_empty_::Enums.Planet#mass.*/ //*->scala::Double#`::`(+6).*/ (radius/*->_empty_::Enums.Planet#radius.*/ */*->scala::Double#`*`(+6).*/ radius/*->_empty_::Enums.Planet#radius.*/)
6060
def surfaceWeight/*<-_empty_::Enums.Planet#surfaceWeight().*/(otherMass/*<-_empty_::Enums.Planet#surfaceWeight().(otherMass)*/: Double/*->scala::Double#*/) = otherMass/*->_empty_::Enums.Planet#surfaceWeight().(otherMass)*/ */*->scala::Double#`*`(+6).*/ surfaceGravity/*->_empty_::Enums.Planet#surfaceGravity().*/

tests/semanticdb/expect/Enums.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ object Enums:
5454

5555
val some1 = Some(Some(1)).unwrap
5656

57-
enum Planet(mass: Double, radius: Double) extends java.lang.Enum[Planet]:
57+
enum Planet(mass: Double, radius: Double) extends Enum[Planet]:
5858
private final val G = 6.67300E-11
5959
def surfaceGravity = G * mass / (radius * radius)
6060
def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity

tests/semanticdb/metac.expect

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ Uri => Enums.scala
642642
Text => empty
643643
Language => Scala
644644
Symbols => 181 entries
645-
Occurrences => 203 entries
645+
Occurrences => 201 entries
646646

647647
Symbols:
648648
_empty_/Enums. => final object Enums
@@ -979,11 +979,9 @@ Occurrences:
979979
[56:20..56:26): Double -> scala/Double#
980980
[56:28..56:34): radius <- _empty_/Enums.Planet#radius.
981981
[56:36..56:42): Double -> scala/Double#
982-
[56:52..56:56): java -> java/
983-
[56:57..56:61): lang -> java/lang/
984-
[56:62..56:66): Enum -> java/lang/Enum#
985-
[56:67..56:73): Planet -> _empty_/Enums.Planet#
986-
[56:74..56:74): -> java/lang/Enum#`<init>`().
982+
[56:52..56:56): Enum -> java/lang/Enum#
983+
[56:57..56:63): Planet -> _empty_/Enums.Planet#
984+
[56:64..56:64): -> java/lang/Enum#`<init>`().
987985
[57:22..57:23): G <- _empty_/Enums.Planet#G.
988986
[58:8..58:22): surfaceGravity <- _empty_/Enums.Planet#surfaceGravity().
989987
[58:25..58:26): G -> _empty_/Enums.Planet#G.

0 commit comments

Comments
 (0)