Fix rebase breakage

odersky · odersky · commit cbd21a0fbfd0 · 2020-03-06T09:16:29.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/core/NameKinds.scala b/compiler/src/dotty/tools/dotc/core/NameKinds.scala
@@ -354,7 +354,6 @@ object NameKinds {
   val InlineAccessorName: PrefixNameKind = new PrefixNameKind(INLINEACCESSOR, "inline$")
 
   val AvoidClashName: SuffixNameKind = new SuffixNameKind(AVOIDCLASH, "$_avoid_name_clash_$")
-  val CacheName = new SuffixNameKind(CACHE, "$_cache")
   val FieldName: SuffixNameKind = new SuffixNameKind(FIELD, "$$local") {
       override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString
   }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ object NameKinds {`
`354`	`354`	`val InlineAccessorName: PrefixNameKind = new PrefixNameKind(INLINEACCESSOR, "inline$")`
`355`	`355`
`356`	`356`	`val AvoidClashName: SuffixNameKind = new SuffixNameKind(AVOIDCLASH, "$_avoid_name_clash_$")`
`357`		`- val CacheName = new SuffixNameKind(CACHE, "$_cache")`
`358`	`357`	`val FieldName: SuffixNameKind = new SuffixNameKind(FIELD, "$$local") {`
`359`	`358`	`override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString`
`360`	`359`	`}`