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

compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.txt

@@ -2,7 +2,7 @@ package
 
 package test {
 
-    internal trait A {
+    internal interface A {
         private final val a: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.txt

@@ -2,7 +2,7 @@ package
 
 package test {
 
-    internal trait A {
+    internal interface A {
         protected abstract val a: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.txt

@@ -1,27 +1,27 @@
 package
 
-internal trait T {
+internal interface T {
     internal abstract var foo: kotlin.Long
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait U {
+internal interface U {
     protected abstract var foo: kotlin.Long
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait V : T, U {
+internal interface V : T, U {
     public abstract override /*2*/ var foo: kotlin.Long
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait W : T, U {
+internal interface W : T, U {
     public abstract override /*2*/ /*fake_override*/ var foo: kotlin.Long
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.txt

@@ -1,20 +1,20 @@
 package
 
-internal trait T {
+internal interface T {
     public abstract var foo: kotlin.Short
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait U {
+internal interface U {
     public abstract var foo: kotlin.Short
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait V : T, U {
+internal interface V : T, U {
     public abstract override /*2*/ var foo: kotlin.Short
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait Y {
+internal interface Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait YSub : Y {
+internal interface YSub : Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/Delegation.txt

@@ -2,7 +2,7 @@ package
 
 package test {
 
-    internal trait Incompatible {
+    internal interface Incompatible {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal open fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -55,14 +55,14 @@ package test {
         public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait X {
+    internal interface X {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal open fun foo(): kotlin.String?
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait Y {
+    internal interface Y {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal open fun foo(): kotlin.String
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/DelegationFun.txt

@@ -2,7 +2,7 @@ package
 
 package delegation {
 
-    internal trait Aaa {
+    internal interface Aaa {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal abstract fun foo(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/DelegationVal.txt

@@ -2,7 +2,7 @@ package
 
 package delegation {
 
-    internal trait Aaa {
+    internal interface Aaa {
         internal abstract val i: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/DelegationVar.txt

@@ -2,7 +2,7 @@ package
 
 package delegation {
 
-    internal trait Aaa {
+    internal interface Aaa {
         internal abstract var i: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/DuplicateMethod.txt

@@ -1,6 +1,6 @@
 package
 
-internal trait Some {
+internal interface Some {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     internal abstract fun test(): kotlin.Unit

compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.txt

@@ -1,6 +1,6 @@
 package
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun </*0*/ T : Foo> foo(): kotlin.Unit where T : Bar
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,13 +15,13 @@ internal final class B : A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Bar {
+internal interface Bar {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Foo {
+internal interface Foo {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.txt

@@ -8,7 +8,7 @@ internal open class Ccc {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Ttt {
+internal interface Ttt {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.txt

@@ -2,7 +2,7 @@ package
 
 internal val obj: A
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun f(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/Generics.txt

@@ -142,14 +142,14 @@ package override {
             public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal trait MyProps</*0*/ T> {
+        internal interface MyProps</*0*/ T> {
             internal abstract val p: T
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal trait MyTrait</*0*/ T> {
+        internal interface MyTrait</*0*/ T> {
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal abstract fun foo(/*0*/ t: T): T
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait X {
+internal interface X {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Y {
+internal interface Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait X {
+internal interface X {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Y {
+internal interface Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.txt

@@ -1,6 +1,6 @@
 package
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ x: kotlin.Int = ...): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,7 +15,7 @@ internal open class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait C {
+internal interface C {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ y: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait X {
+internal interface X {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Y {
+internal interface Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/NonGenerics.txt

@@ -92,7 +92,7 @@ package override {
             public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal trait MyTrait {
+        internal interface MyTrait {
             internal abstract val pr: kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal abstract fun foo(): kotlin.Unit

compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.txt

@@ -2,14 +2,14 @@ package
 
 internal val obj: D
 
-internal trait D {
+internal interface D {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait E {
+internal interface E {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait X {
+internal interface X {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Y {
+internal interface Y {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.txt

@@ -2,14 +2,14 @@ package
 
 package d {
 
-    internal trait A {
+    internal interface A {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal open fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait B {
+    internal interface B {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal open fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -32,7 +32,7 @@ package d {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait E {
+    internal interface E {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal abstract fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.txt

@@ -2,14 +2,14 @@ package
 
 package test {
 
-    internal trait A {
+    internal interface A {
         protected abstract val a: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait B {
+    internal interface B {
         protected abstract val a: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/SuspiciousCase1.txt

@@ -2,7 +2,7 @@ package
 
 internal fun zz(/*0*/ b: Baz): kotlin.Int
 
-internal trait Bar</*0*/ Q> : Foo<Q> {
+internal interface Bar</*0*/ Q> : Foo<Q> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     internal open override /*1*/ /*fake_override*/ fun quux(/*0*/ p: Q, /*1*/ q: kotlin.Int = ...): kotlin.Int
@@ -17,7 +17,7 @@ internal abstract class Baz : Bar<kotlin.String> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Foo</*0*/ P> {
+internal interface Foo</*0*/ P> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     internal open fun quux(/*0*/ p: P, /*1*/ q: kotlin.Int = ...): kotlin.Int

compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.txt

@@ -1,6 +1,6 @@
 package
 
-internal trait Bar {
+internal interface Bar {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,7 +15,7 @@ internal final class Baz : Foo, Bar {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Foo {
+internal interface Foo {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt1862.txt

@@ -16,7 +16,7 @@ internal open class Bbb : Aaa {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Ccc : Aaa {
+internal interface Ccc : Aaa {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt2052.txt

@@ -8,7 +8,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Runnable {
+internal interface Runnable {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     internal abstract fun run(): kotlin.Unit

compiler/testData/diagnostics/tests/override/kt2491.txt

@@ -18,7 +18,7 @@ internal final class D : C, T {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T {
+internal interface T {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt4763.txt

@@ -2,7 +2,7 @@ package
 
 internal val d: A
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun f(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt4763property.txt

@@ -2,7 +2,7 @@ package
 
 internal val s: Q
 
-internal trait P {
+internal interface P {
     internal abstract var f: kotlin.Number
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt4785.txt

@@ -18,7 +18,7 @@ internal final class E : C, T {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T {
+internal interface T {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt4785classObject.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait B {
+internal interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     protected open fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt4785delegation.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait A {
+internal interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait B {
+internal interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     protected abstract fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/kt880.txt

@@ -8,7 +8,7 @@ public abstract class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public trait I {
+public interface I {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     internal abstract fun test(): kotlin.Unit

compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.txt

@@ -1,13 +1,13 @@
 package
 
-internal trait A {
+internal interface A {
     internal abstract fun b(/*0*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait B : A {
+internal interface B : A {
     internal abstract override /*1*/ /*fake_override*/ fun b(/*0*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.txt

@@ -1,27 +1,27 @@
 package
 
-internal trait C {
+internal interface C {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait D {
+internal interface D {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ b: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait E : C, D {
+internal interface E : C, D {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ b: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait F : C, D {
+internal interface F : C, D {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*2*/ fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt

@@ -3,7 +3,7 @@ package
 public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Sub
 public/*package*/ /*synthesized*/ fun Super(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Super
 
-public/*package*/ trait Sub : Super {
+public/*package*/ interface Sub : Super {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -18,7 +18,7 @@ internal final class SubSub : Sub {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait Super {
+public/*package*/ interface Super {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt

@@ -2,7 +2,7 @@ package
 
 public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub
 
-public/*package*/ trait Sub : Super {
+public/*package*/ interface Sub : Super {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ superName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,7 +17,7 @@ internal final class SubSub : Sub {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Super {
+internal interface Super {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ superName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt

@@ -6,42 +6,42 @@ public/*package*/ /*synthesized*/ fun Sub1(/*0*/ function: (kotlin.Int) -> kotli
 public/*package*/ /*synthesized*/ fun Sub2(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub2
 public/*package*/ /*synthesized*/ fun Sub3(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub3
 
-public/*package*/ trait JSuper1 {
+public/*package*/ interface JSuper1 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(/*0*/ jsuper1Name: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait JSuper2 {
+public/*package*/ interface JSuper2 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(/*0*/ jsuper2Name: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait KSuper {
+internal interface KSuper {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait Sub1 : KSuper, JSuper1, JSuper2 {
+public/*package*/ interface Sub1 : KSuper, JSuper1, JSuper2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait Sub2 : JSuper1, KSuper, JSuper2 {
+public/*package*/ interface Sub2 : JSuper1, KSuper, JSuper2 {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait Sub3 : JSuper1, JSuper2, KSuper {
+public/*package*/ interface Sub3 : JSuper1, JSuper2, KSuper {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt

@@ -10,14 +10,14 @@ internal final class BothTraitsSubclass : JavaInterface, KotlinTrait {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ trait JavaInterface {
+public/*package*/ interface JavaInterface {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait KotlinTrait {
+internal interface KotlinTrait {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(/*0*/ someOtherName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt

@@ -2,7 +2,7 @@ package
 
 public/*package*/ /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JavaInterface
 
-public/*package*/ trait JavaInterface {
+public/*package*/ interface JavaInterface {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -25,7 +25,7 @@ internal final class Subclass : SubtraitWithFakeOverride {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait SubtraitWithFakeOverride : JavaInterface {
+internal interface SubtraitWithFakeOverride : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int