replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.txt

@@ -3,17 +3,17 @@ package test
 public final class InheritMethodsDifferentReturnTypes {
     public constructor InheritMethodsDifferentReturnTypes()
 
-    public trait Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
+    public interface Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String!
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun bar(): kotlin.String!
         public abstract fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun bar(): kotlin.CharSequence!
         public abstract fun foo(): kotlin.String!
     }

compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.txt

@@ -3,17 +3,17 @@ package test
 public final class InheritMethodsDifferentReturnTypesGeneric {
     public constructor InheritMethodsDifferentReturnTypesGeneric()
 
-    public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String!, kotlin.CharSequence!>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence!, kotlin.String!> {
+    public interface Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String!, kotlin.CharSequence!>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence!, kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String!
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String!
     }
 
-    public trait Super1</*0*/ F, /*1*/ B> {
+    public interface Super1</*0*/ F, /*1*/ B> {
         public abstract fun bar(): B!
         public abstract fun foo(): F!
     }
 
-    public trait Super2</*0*/ FF, /*1*/ BB> {
+    public interface Super2</*0*/ FF, /*1*/ BB> {
         public abstract fun bar(): BB!
         public abstract fun foo(): FF!
     }

compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait IntrinsicCompanionObject {
+public interface IntrinsicCompanionObject {
     public abstract fun testChar(/*0*/ p0: kotlin.Char.Companion!): kotlin.Unit
     public abstract fun testEnum(/*0*/ p0: kotlin.Enum.Companion!): kotlin.Unit
     public abstract fun testInt(/*0*/ p0: kotlin.Int.Companion!): kotlin.Unit

compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait RawTypeWithUpperBound {
+public interface RawTypeWithUpperBound {
 
-    public trait Bar {
+    public interface Bar {
         public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<*>!): kotlin.Unit
         public abstract fun g(/*0*/ p0: kotlin.(Mutable)List<test.RawTypeWithUpperBound.Foo<*>!>!): kotlin.Unit
     }
 
-    public trait Foo</*0*/ T : kotlin.CharSequence!> {
+    public interface Foo</*0*/ T : kotlin.CharSequence!> {
     }
 }

compiler/testData/loadJava/compiledJava/RawUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>!> {
+public interface RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>!> {
 }

compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>!> {
+public interface RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>!> {
 }

compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>!> {
+public interface RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>!> {
 }

compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait RemoveRedundantProjectionKind {
+public interface RemoveRedundantProjectionKind {
     public abstract fun f(/*0*/ p0: (kotlin.MutableCollection<out kotlin.CharSequence!>..kotlin.Collection<kotlin.CharSequence!>?)): kotlin.Unit
     public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence!>!): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/SubclassFromNested.txt

@@ -3,7 +3,7 @@ package test
 public/*package*/ open class B {
     public/*package*/ constructor B(/*0*/ p0: test.B.C!)
 
-    public/*package*/ trait C {
+    public/*package*/ interface C {
     }
 }
 

compiler/testData/loadJava/compiledJava/UnboundWildcard.txt

@@ -5,6 +5,6 @@ public final class UnboundWildcard {
     public final fun collection(): kotlin.(Mutable)Collection<*>!
     public final fun foo(): test.UnboundWildcard.MyClass<*>!
 
-    public trait MyClass</*0*/ T : kotlin.CharSequence!> {
+    public interface MyClass</*0*/ T : kotlin.CharSequence!> {
     }
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait AnnotationInParam {
+public interface AnnotationInParam {
 
     test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A {
         public constructor A()

compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait ArrayOfEnumInParam {
+public interface ArrayOfEnumInParam {
 
     java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array<out java.lang.annotation.ElementType>) public final annotation class targetAnnotation : kotlin.Annotation {
         public constructor targetAnnotation(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait ArrayOfStringInParam {
+public interface ArrayOfStringInParam {
 
     test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<out kotlin.String>) public open class A {
         public constructor A()

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait CustomAnnotation {
+public interface CustomAnnotation {
 
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait CustomAnnotationWithDefaultParameter {
+public interface CustomAnnotationWithDefaultParameter {
 
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...)

compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait EmptyArrayInParam {
+public interface EmptyArrayInParam {
 
     test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<out kotlin.String>) public open class A {
         public constructor A()

compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait EnumInParam {
+public interface EnumInParam {
 
     public final annotation class MyRetention : kotlin.Annotation {
         public constructor MyRetention(/*0*/ value: java.lang.annotation.RetentionPolicy)

compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait PrimitiveValueInParam {
+public interface PrimitiveValueInParam {
 
     test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A {
         public constructor A()

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait RecursiveAnnotation {
+public interface RecursiveAnnotation {
 
     test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait RecursiveAnnotation2 {
+public interface RecursiveAnnotation2 {
 
     public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)

compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait StringConcatenationInParam {
+public interface StringConcatenationInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait StringConstantInParam {
+public interface StringConstantInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait StringInParam {
+public interface StringInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait JavaBeanAbstractGetter {
+public interface JavaBeanAbstractGetter {
     public abstract fun getBlue(): kotlin.Int
     public abstract fun getRed(): kotlin.Int
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt

@@ -4,6 +4,6 @@ public final class StarProjection {
     public constructor StarProjection()
     public final fun foo(): test.StarProjection.MyClass<*>!
 
-    public trait MyClass</*0*/ T : kotlin.CharSequence!> {
+    public interface MyClass</*0*/ T : kotlin.CharSequence!> {
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt

@@ -1,8 +1,8 @@
 package test
 
-public trait PropagateTypeArgumentNullable {
+public interface PropagateTypeArgumentNullable {
 
-    public trait Sub : test.PropagateTypeArgumentNullable.Super {
+    public interface Sub : test.PropagateTypeArgumentNullable.Super {
         public abstract override /*1*/ fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
         public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
         public abstract override /*1*/ fun invR(): kotlin.(Mutable)List<kotlin.String!>!
@@ -11,7 +11,7 @@ public trait PropagateTypeArgumentNullable {
         public abstract override /*1*/ fun outS(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
         public abstract fun invOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
         public abstract fun invR(): kotlin.(Mutable)List<kotlin.String!>!

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait ChangeProjectionKind1 {
+public interface ChangeProjectionKind1 {
 
-    public trait Sub : test.ChangeProjectionKind1.Super {
+    public interface Sub : test.ChangeProjectionKind1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait ChangeProjectionKind2 {
+public interface ChangeProjectionKind2 {
 
-    public trait Sub : test.ChangeProjectionKind2.Super {
+    public interface Sub : test.ChangeProjectionKind2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter {
+public interface DeeplySubstitutedClassParameter {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
+    public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: E!): kotlin.Unit
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
+    public interface Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2 {
+public interface DeeplySubstitutedClassParameter2 {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
+    public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E!): kotlin.Unit
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
+    public interface Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritMutability {
+public interface InheritMutability {
 
-    public trait Sub : test.InheritMutability.Super {
+    public interface Sub : test.InheritMutability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVararg {
+public interface InheritNotVararg {
 
-    public trait Sub : test.InheritNotVararg.Super {
+    public interface Sub : test.InheritNotVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargInteger {
+public interface InheritNotVarargInteger {
 
-    public trait Sub : test.InheritNotVarargInteger.Super {
+    public interface Sub : test.InheritNotVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.Int!>?..kotlin.Array<out kotlin.Int!>?)): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.Int!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargNotNull {
+public interface InheritNotVarargNotNull {
 
-    public trait Sub : test.InheritNotVarargNotNull.Super {
+    public interface Sub : test.InheritNotVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargPrimitive {
+public interface InheritNotVarargPrimitive {
 
-    public trait Sub : test.InheritNotVarargPrimitive.Super {
+    public interface Sub : test.InheritNotVarargPrimitive.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.IntArray!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullability {
+public interface InheritNullability {
 
-    public trait Sub : test.InheritNullability.Super {
+    public interface Sub : test.InheritNullability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritProjectionKind {
+public interface InheritProjectionKind {
 
-    public trait Sub : test.InheritProjectionKind.Super {
+    public interface Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnliness {
+public interface InheritReadOnliness {
 
-    public trait Sub : test.InheritReadOnliness.Super {
+    public interface Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVararg {
+public interface InheritVararg {
 
-    public trait Sub : test.InheritVararg.Super {
+    public interface Sub : test.InheritVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargInteger {
+public interface InheritVarargInteger {
 
-    public trait Sub : test.InheritVarargInteger.Super {
+    public interface Sub : test.InheritVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargNotNull {
+public interface InheritVarargNotNull {
 
-    public trait Sub : test.InheritVarargNotNull.Super {
+    public interface Sub : test.InheritVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargPrimitive {
+public interface InheritVarargPrimitive {
 
-    public trait Sub : test.InheritVarargPrimitive.Super {
+    public interface Sub : test.InheritVarargPrimitive.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait Kt3302 {
+public interface Kt3302 {
 
-    public trait BSONObject {
+    public interface BSONObject {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun put(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!, /*1*/ org.jetbrains.annotations.NotNull() p1: kotlin.Any!): kotlin.Any!
     }
 
-    public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
+    public interface BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Any!): kotlin.Any!
     }
 
-    public trait LinkedHashMap</*0*/ K, /*1*/ V> {
+    public interface LinkedHashMap</*0*/ K, /*1*/ V> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun put(/*0*/ key: K!, /*1*/ value: V!): V!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait MutableToReadOnly {
+public interface MutableToReadOnly {
 
-    public trait Sub : test.MutableToReadOnly.Super {
+    public interface Sub : test.MutableToReadOnly.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait NotNullToNullable {
+public interface NotNullToNullable {
 
-    public trait Sub : test.NotNullToNullable.Super {
+    public interface Sub : test.NotNullToNullable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait NullableToNotNull {
+public interface NullableToNotNull {
 
-    public trait Sub : test.NullableToNotNull.Super {
+    public interface Sub : test.NullableToNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait NullableToNotNullKotlinSignature {
+public interface NullableToNotNullKotlinSignature {
 
-    public trait Sub : test.NullableToNotNullKotlinSignature.Super {
+    public interface Sub : test.NullableToNotNullKotlinSignature.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt

@@ -1,14 +1,14 @@
 package test
 
-public trait OverrideWithErasedParameter {
+public interface OverrideWithErasedParameter {
 
-    public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T!> {
+    public interface Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: T!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait ReadOnlyToMutable {
+public interface ReadOnlyToMutable {
 
-    public trait Sub : test.ReadOnlyToMutable.Super {
+    public interface Sub : test.ReadOnlyToMutable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait SubclassFromGenericAndNot {
+public interface SubclassFromGenericAndNot {
 
-    public trait Generic</*0*/ T> {
+    public interface Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ key: T!): kotlin.Unit
     }
 
-    public trait NonGeneric {
+    public interface NonGeneric {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
     }
 
-    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
+    public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait SubstitutedClassParameter {
+public interface SubstitutedClassParameter {
 
-    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
+    public interface Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait SubstitutedClassParameters {
+public interface SubstitutedClassParameters {
 
-    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
+    public interface Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
-    public trait Super1</*0*/ T> {
+    public interface Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }
 
-    public trait Super2</*0*/ E> {
+    public interface Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: E!): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNotNullJavaSubtype {
+public interface AddNotNullJavaSubtype {
 
-    public trait Sub : test.AddNotNullJavaSubtype.Super {
+    public interface Sub : test.AddNotNullJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNotNullSameJavaType {
+public interface AddNotNullSameJavaType {
 
-    public trait Sub : test.AddNotNullSameJavaType.Super {
+    public interface Sub : test.AddNotNullSameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilityJavaSubtype {
+public interface AddNullabilityJavaSubtype {
 
-    public trait Sub : test.AddNullabilityJavaSubtype.Super {
+    public interface Sub : test.AddNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameGenericType1 {
+public interface AddNullabilitySameGenericType1 {
 
-    public trait Sub : test.AddNullabilitySameGenericType1.Super {
+    public interface Sub : test.AddNullabilitySameGenericType1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameGenericType2 {
+public interface AddNullabilitySameGenericType2 {
 
-    public trait Sub : test.AddNullabilitySameGenericType2.Super {
+    public interface Sub : test.AddNullabilitySameGenericType2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameJavaType {
+public interface AddNullabilitySameJavaType {
 
-    public trait Sub : test.AddNullabilitySameJavaType.Super {
+    public interface Sub : test.AddNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait CantMakeImmutableInSubclass {
+public interface CantMakeImmutableInSubclass {
 
-    public trait Sub : test.CantMakeImmutableInSubclass.Super {
+    public interface Sub : test.CantMakeImmutableInSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter {
+public interface DeeplySubstitutedClassParameter {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
+    public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): E!
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
+    public interface Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2 {
+public interface DeeplySubstitutedClassParameter2 {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
+    public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(): E!
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
+    public interface Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait HalfSubstitutedTypeParameters {
+public interface HalfSubstitutedTypeParameters {
 
-    public trait Sub : test.HalfSubstitutedTypeParameters.Super {
+    public interface Sub : test.HalfSubstitutedTypeParameters.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<kotlin.Int!, kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E!> {
+    public interface TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E!> {
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilityGenericSubclassSimple {
+public interface InheritNullabilityGenericSubclassSimple {
 
-    public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
+    public interface Sub : test.InheritNullabilityGenericSubclassSimple.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilityJavaSubtype {
+public interface InheritNullabilityJavaSubtype {
 
-    public trait Sub : test.InheritNullabilityJavaSubtype.Super {
+    public interface Sub : test.InheritNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilitySameGenericType {
+public interface InheritNullabilitySameGenericType {
 
-    public trait Sub : test.InheritNullabilitySameGenericType.Super {
+    public interface Sub : test.InheritNullabilitySameGenericType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilitySameJavaType {
+public interface InheritNullabilitySameJavaType {
 
-    public trait Sub : test.InheritNullabilitySameJavaType.Super {
+    public interface Sub : test.InheritNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritProjectionKind {
+public interface InheritProjectionKind {
 
-    public trait Sub : test.InheritProjectionKind.Super {
+    public interface Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.Number!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.Number!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessOfArgument {
+public interface InheritReadOnlinessOfArgument {
 
-    public trait Sub : test.InheritReadOnlinessOfArgument.Super {
+    public interface Sub : test.InheritReadOnlinessOfArgument.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessSameClass {
+public interface InheritReadOnlinessSameClass {
 
-    public trait Sub : test.InheritReadOnlinessSameClass.Super {
+    public interface Sub : test.InheritReadOnlinessSameClass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessSubclass {
+public interface InheritReadOnlinessSubclass {
 
-    public trait Sub : test.InheritReadOnlinessSubclass.Super {
+    public interface Sub : test.InheritReadOnlinessSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait SameProjectionKind {
+public interface SameProjectionKind {
 
-    public trait Sub : test.SameProjectionKind.Super {
+    public interface Sub : test.SameProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait SubclassFromGenericAndNot {
+public interface SubclassFromGenericAndNot {
 
-    public trait Generic</*0*/ T> {
+    public interface Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T!
     }
 
-    public trait NonGeneric {
+    public interface NonGeneric {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.String!
     }
 
-    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
+    public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E!> {
+public interface SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E!> {
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K!, V!> {
+public interface SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K!, V!> {
     public abstract override /*1*/ /*fake_override*/ fun getKey(): K!
     public abstract override /*1*/ /*fake_override*/ fun getValue(): V!
     public abstract override /*1*/ fun setValue(/*0*/ value: V!): V!

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait SubstitutedClassParameter {
+public interface SubstitutedClassParameter {
 
-    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
+    public interface Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait SubstitutedClassParameters {
+public interface SubstitutedClassParameters {
 
-    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
+    public interface Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String!
     }
 
-    public trait Super1</*0*/ T> {
+    public interface Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T!
     }
 
-    public trait Super2</*0*/ E> {
+    public interface Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): E!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesConflictingProjectionKinds {
+public interface TwoSuperclassesConflictingProjectionKinds {
 
-    public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
+    public interface Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferMutability {
+public interface TwoSuperclassesInvariantAndCovariantInferMutability {
 
-    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
+    public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferNullability {
+public interface TwoSuperclassesInvariantAndCovariantInferNullability {
 
-    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
+    public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesMutableAndNot {
+public interface TwoSuperclassesMutableAndNot {
 
-    public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
+    public interface Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesReturnJavaSubtype {
+public interface TwoSuperclassesReturnJavaSubtype {
 
-    public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
+    public interface Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesReturnSameJavaType {
+public interface TwoSuperclassesReturnSameJavaType {
 
-    public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
+    public interface Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesSupplementNotNull {
+public interface TwoSuperclassesSupplementNotNull {
 
-    public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
+    public interface Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfClass {
+public interface TypeParamOfClass {
 
-    public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T!> {
+    public interface Sub</*0*/ T> : test.TypeParamOfClass.Super<T!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): T!
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfClassSubstituted {
+public interface TypeParamOfClassSubstituted {
 
-    public trait Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String!> {
+    public interface Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
-    public trait Super</*0*/ T> {
+    public interface Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfFun {
+public interface TypeParamOfFun {
 
-    public trait Sub : test.TypeParamOfFun.Super {
+    public interface Sub : test.TypeParamOfFun.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun </*0*/ E> foo(): E!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun dummy(): kotlin.Unit
         org.jetbrains.annotations.NotNull() public abstract fun </*0*/ T> foo(): T!
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait InheritMutability {
+public interface InheritMutability {
 
-    public trait Sub : test.InheritMutability.Super {
+    public interface Sub : test.InheritMutability.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: A!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait InheritNullability {
+public interface InheritNullability {
 
-    public trait Sub : test.InheritNullability.Super {
+    public interface Sub : test.InheritNullability.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait InheritReadOnliness {
+public interface InheritReadOnliness {
 
-    public trait Sub : test.InheritReadOnliness.Super {
+    public interface Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: A!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait TwoBounds {
+public interface TwoBounds {
 
-    public trait Sub : test.TwoBounds.Super {
+    public interface Sub : test.TwoBounds.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit where B : kotlin.Cloneable!
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit where A : kotlin.Cloneable!
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt

@@ -1,16 +1,16 @@
 package test
 
-public trait TwoSuperclasses {
+public interface TwoSuperclasses {
 
-    public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
+    public interface Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
         public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence!> foo(/*0*/ a: C!): kotlin.Unit
     }
 
-    public trait Super1 {
+    public interface Super1 {
         public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit
     }
 
-    public trait Super2 {
+    public interface Super2 {
         public abstract fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait TwoTypeParameters {
+public interface TwoTypeParameters {
 
-    public trait Sub : test.TwoTypeParameters.Super {
+    public interface Sub : test.TwoTypeParameters.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!, /*1*/ A : kotlin.Cloneable!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.Cloneable!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterAsUpperBound {
+public interface UseParameterAsUpperBound {
 
-    public trait Sub : test.UseParameterAsUpperBound.Super {
+    public interface Sub : test.UseParameterAsUpperBound.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A, /*1*/ B : A!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterInUpperBound {
+public interface UseParameterInUpperBound {
 
-    public trait Sub : test.UseParameterInUpperBound.Super {
+    public interface Sub : test.UseParameterInUpperBound.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterInUpperBoundWithKotlinSignature {
+public interface UseParameterInUpperBoundWithKotlinSignature {
 
-    public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
+    public interface Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ b: B!, /*1*/ a: A!): kotlin.Unit
     }
 
-    public trait Super {
+    public interface Super {
         public abstract fun </*0*/ A, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/library/LoadIterable.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterable</*0*/ T> {
+public interface LoadIterable</*0*/ T> {
     public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/library/LoadIterator.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterator</*0*/ T> {
+public interface LoadIterator</*0*/ T> {
     public abstract fun getIterator(): kotlin.(Mutable)Iterator<T!>!
     public abstract fun setIterator(/*0*/ p0: kotlin.(Mutable)Iterator<T!>!): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterable</*0*/ T> {
+public interface LoadIterable</*0*/ T> {
     org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterableWithConflict</*0*/ T> {
+public interface LoadIterableWithConflict</*0*/ T> {
     org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterableWithNullability</*0*/ T> {
+public interface LoadIterableWithNullability</*0*/ T> {
     org.jetbrains.annotations.NotNull() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     org.jetbrains.annotations.NotNull() org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() org.jetbrains.annotations.NotNull() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit