Rendering changed: "annotation class" is now just "class" (with kotlin.annotation.annotation if it's kotlin annotation).

A swarm of tests fixed accordingly.

compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class AnnotationArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnotationArray : kotlin.Annotation {
     public constructor AnnotationArray(/*0*/ annotationArray: kotlin.Array<test.JustAnnotation>)
     internal final val annotationArray: kotlin.Array<test.JustAnnotation>
 }
@@ -13,11 +13,11 @@ test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Em
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class Empty : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Empty : kotlin.Annotation {
     public constructor Empty()
 }
 
-kotlin.annotation.annotation() internal final annotation class JustAnnotation : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustAnnotation : kotlin.Annotation {
     public constructor JustAnnotation(/*0*/ annotation: test.Empty)
     internal final val annotation: test.Empty
 }

compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt

@@ -8,12 +8,12 @@ test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) internal final class C2
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class EnumArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class EnumArray : kotlin.Annotation {
     public constructor EnumArray(/*0*/ enumArray: kotlin.Array<test.Weapon>)
     internal final val enumArray: kotlin.Array<test.Weapon>
 }
 
-kotlin.annotation.annotation() internal final annotation class JustEnum : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustEnum : kotlin.Annotation {
     public constructor JustEnum(/*0*/ weapon: test.Weapon)
     internal final val weapon: test.Weapon
 }

compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt

@@ -8,7 +8,7 @@ test.PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleAr
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class PrimitiveArrays : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class PrimitiveArrays : kotlin.Annotation {
     public constructor PrimitiveArrays(/*0*/ byteArray: kotlin.ByteArray, /*1*/ charArray: kotlin.CharArray, /*2*/ shortArray: kotlin.ShortArray, /*3*/ intArray: kotlin.IntArray, /*4*/ longArray: kotlin.LongArray, /*5*/ floatArray: kotlin.FloatArray, /*6*/ doubleArray: kotlin.DoubleArray, /*7*/ booleanArray: kotlin.BooleanArray)
     internal final val booleanArray: kotlin.BooleanArray
     internal final val byteArray: kotlin.ByteArray

compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt

@@ -8,7 +8,7 @@ test.Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double =
     public constructor D()
 }
 
-kotlin.annotation.annotation() internal final annotation class Primitives : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Primitives : kotlin.Annotation {
     public constructor Primitives(/*0*/ byte: kotlin.Byte, /*1*/ char: kotlin.Char, /*2*/ short: kotlin.Short, /*3*/ int: kotlin.Int, /*4*/ long: kotlin.Long, /*5*/ float: kotlin.Float, /*6*/ double: kotlin.Double, /*7*/ boolean: kotlin.Boolean)
     internal final val boolean: kotlin.Boolean
     internal final val byte: kotlin.Byte

compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt

@@ -8,12 +8,12 @@ test.StringArray(stringArray = {"java", ""}) internal final class C2 {
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class JustString : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustString : kotlin.Annotation {
     public constructor JustString(/*0*/ string: kotlin.String)
     internal final val string: kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class StringArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class StringArray : kotlin.Annotation {
     public constructor StringArray(/*0*/ stringArray: kotlin.Array<kotlin.String>)
     internal final val stringArray: kotlin.Array<kotlin.String>
 }

compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt

@@ -32,11 +32,11 @@ internal final enum class My : kotlin.Enum<test.My> {
     public final /*synthesized*/ fun values(): kotlin.Array<test.My>
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array<out test.My>*/)
     internal final val m: kotlin.Array<out test.My>
 }
 
-test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() internal final annotation class annotated : kotlin.Annotation {
+test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() internal final class annotated : kotlin.Annotation {
     public constructor annotated()
 }

compiler/testData/serialization/builtinsSerializer/annotationTargets.txt

@@ -21,7 +21,7 @@ test.anno(x = "top level class") internal final class C1 {
     }
 }
 
-kotlin.annotation.annotation() internal final annotation class anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class anno : kotlin.Annotation {
     public constructor anno(/*0*/ x: kotlin.String)
     internal final val x: kotlin.String
 }