Avoid duplicate hashCode/equals

2 files changed, 2 insertions, 4 deletions

diff --git a/compiler/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala
index 37df9cd24..d1412c35c 100644
--- a/compiler/src/dotty/tools/dotc/core/Names.scala
+++ b/compiler/src/dotty/tools/dotc/core/Names.scala
@@ -105,6 +105,7 @@ object Names {
     def lastIndexOfSlice(str: String): Int = lastPart.toString.lastIndexOfSlice(str)
     def lastIndexOfSlice(name: Name): Int = lastIndexOfSlice(name.toString)
 
+    override def hashCode = System.identityHashCode(this)
     override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
   }
 
@@ -196,9 +197,6 @@ object Names {
       thisKind == kind ||
       !thisKind.definesNewName && thisKind.tag > kind.tag && underlying.is(kind)
     }
-
-    override def hashCode = System.identityHashCode(this)
-    override def equals(other: Any) = this eq other.asInstanceOf[AnyRef]
   }
 
   class SimpleTermName(val start: Int, val length: Int, @sharable private[Names] var next: SimpleTermName) extends TermName {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala
index 602bdeb02..d1997376d 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala
@@ -223,8 +223,8 @@ object TastyFormat {
   final val UTF8 = 1
   final val QUALIFIED = 2
   final val FLATTENED = 3
-  final val EXPANDPREFIX = 5
   final val EXPANDED = 4
+  final val EXPANDPREFIX = 5
   final val TRAITSETTER = 6
   final val UNIQUE = 10
   final val DEFAULTGETTER = 11