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

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java

@@ -53,8 +53,8 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
         MAP.put(ErrorsJvm.OVERLOADS_PRIVATE, "''overloads'' annotation has no effect on private and local declarations");
         MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_BE_ABSTRACT, "Native declaration can not be abstract");
         MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_HAVE_BODY, "Native declaration can not have a body");
-        MAP.put(ErrorsJvm.NATIVE_DECLARATION_IN_TRAIT, "Members of traits can not be native");
-        MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_BE_INLINED, "Members of traits can not be inlined");
+        MAP.put(ErrorsJvm.NATIVE_DECLARATION_IN_TRAIT, "Members of interfaces can not be native");
+        MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_BE_INLINED, "Members of interfaces can not be inlined");
 
         MAP.put(ErrorsJvm.POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION, "Only named arguments are available for Java annotations");
         MAP.put(ErrorsJvm.JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION, "Usage of `javaClass<T>()` in annotations is deprecated. Use T::class instead");
@@ -65,7 +65,7 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
         MAP.put(ErrorsJvm.NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS,
                 "Expected type does not accept nulls in {0}, but the value may be null in {1}", Renderers.TO_STRING, Renderers.TO_STRING);
 
-        MAP.put(ErrorsJvm.TRAIT_CANT_CALL_DEFAULT_METHOD_VIA_SUPER, "Traits can't call Java default methods via super");
+        MAP.put(ErrorsJvm.TRAIT_CANT_CALL_DEFAULT_METHOD_VIA_SUPER, "Interfaces can't call Java default methods via super");
     }
 
 

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -123,13 +123,13 @@ public class DefaultErrorMessages {
         MAP.put(INAPPLICABLE_ANNOTATION, "This annotation is only applicable to top level functions");
 
         MAP.put(REDUNDANT_MODIFIER, "Modifier ''{0}'' is redundant because ''{1}'' is present", TO_STRING, TO_STRING);
-        MAP.put(ABSTRACT_MODIFIER_IN_TRAIT, "Modifier ''abstract'' is redundant in trait");
-        MAP.put(OPEN_MODIFIER_IN_TRAIT, "Modifier ''open'' is redundant in trait");
+        MAP.put(ABSTRACT_MODIFIER_IN_TRAIT, "Modifier ''abstract'' is redundant in interface");
+        MAP.put(OPEN_MODIFIER_IN_TRAIT, "Modifier ''open'' is redundant in interface");
         MAP.put(OPEN_MODIFIER_IN_ENUM, "Modifier ''open'' is not applicable for enum class");
         MAP.put(ABSTRACT_MODIFIER_IN_ENUM, "Modifier ''abstract'' is not applicable for enum class");
         MAP.put(ILLEGAL_ENUM_ANNOTATION, "Annotation ''enum'' is only applicable for class");
         MAP.put(REDUNDANT_MODIFIER_IN_GETTER, "Visibility modifiers are redundant in getter");
-        MAP.put(TRAIT_CAN_NOT_BE_FINAL, "Trait cannot be final");
+        MAP.put(TRAIT_CAN_NOT_BE_FINAL, "Interface cannot be final");
         MAP.put(TYPE_PARAMETERS_IN_ENUM, "Enum class cannot have type parameters");
         MAP.put(TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM,
                 "Type checking has run into a recursive problem. Easiest workaround: specify types of your declarations explicitly"); // TODO: message
@@ -176,17 +176,17 @@ public class DefaultErrorMessages {
 
         MAP.put(ABSTRACT_DELEGATED_PROPERTY, "Delegated property cannot be abstract");
         MAP.put(ACCESSOR_FOR_DELEGATED_PROPERTY, "Delegated property cannot have accessors with non-default implementations");
-        MAP.put(DELEGATED_PROPERTY_IN_TRAIT, "Delegated properties are not allowed in traits");
+        MAP.put(DELEGATED_PROPERTY_IN_TRAIT, "Delegated properties are not allowed in interfaces");
         MAP.put(LOCAL_VARIABLE_WITH_DELEGATE, "Local variables are not allowed to have delegates");
 
         MAP.put(PACKAGE_MEMBER_CANNOT_BE_PROTECTED, "Package member cannot be protected");
 
         MAP.put(GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY, "Getter visibility must be the same as property visibility");
-        MAP.put(BACKING_FIELD_IN_TRAIT, "Property in a trait cannot have a backing field");
+        MAP.put(BACKING_FIELD_IN_TRAIT, "Property in an interface cannot have a backing field");
         MAP.put(MUST_BE_INITIALIZED, "Property must be initialized");
         MAP.put(MUST_BE_INITIALIZED_OR_BE_ABSTRACT, "Property must be initialized or be abstract");
-        MAP.put(PROPERTY_INITIALIZER_IN_TRAIT, "Property initializers are not allowed in traits");
-        MAP.put(FINAL_PROPERTY_IN_TRAIT, "Abstract property in trait cannot be final");
+        MAP.put(PROPERTY_INITIALIZER_IN_TRAIT, "Property initializers are not allowed in interfaces");
+        MAP.put(FINAL_PROPERTY_IN_TRAIT, "Abstract property in an interface cannot be final");
         MAP.put(EXTENSION_PROPERTY_WITH_BACKING_FIELD, "Extension property cannot be initialized because it has no backing field");
         MAP.put(PROPERTY_INITIALIZER_NO_BACKING_FIELD, "Initializer is not allowed here because this property has no backing field");
         MAP.put(ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS, "Abstract property ''{0}'' in non-abstract class ''{1}''", STRING, NAME);
@@ -257,9 +257,9 @@ public class DefaultErrorMessages {
 
         MAP.put(LOCAL_OBJECT_NOT_ALLOWED, "Named object ''{0}'' is a singleton and cannot be local. Try to use anonymous object instead", NAME);
         MAP.put(LOCAL_ENUM_NOT_ALLOWED, "Enum class ''{0}'' cannot be local", NAME);
-        MAP.put(DELEGATION_IN_TRAIT, "Traits cannot use delegation");
-        MAP.put(DELEGATION_NOT_TO_TRAIT, "Only traits can be delegated to");
-        MAP.put(UNMET_TRAIT_REQUIREMENT, "Super trait ''{0}'' requires subclasses to extend ''{1}''", NAME, NAME);
+        MAP.put(DELEGATION_IN_TRAIT, "Interfaces cannot use delegation");
+        MAP.put(DELEGATION_NOT_TO_TRAIT, "Only interfaces can be delegated to");
+        MAP.put(UNMET_TRAIT_REQUIREMENT, "Super interface ''{0}'' requires subclasses to extend ''{1}''", NAME, NAME);
         MAP.put(NO_CONSTRUCTOR, "This class does not have a constructor");
         MAP.put(NOT_A_CLASS, "Not a class");
         MAP.put(ILLEGAL_ESCAPE_SEQUENCE, "Illegal escape sequence");
@@ -286,7 +286,7 @@ public class DefaultErrorMessages {
         MAP.put(SETTER_PARAMETER_WITH_DEFAULT_VALUE, "Setter parameters cannot have default values");
         MAP.put(NO_THIS, "'this' is not defined in this context");
         MAP.put(SUPER_NOT_AVAILABLE, "No supertypes are accessible in this context");
-        MAP.put(SUPERCLASS_NOT_ACCESSIBLE_FROM_TRAIT, "Superclass is not accessible from trait");
+        MAP.put(SUPERCLASS_NOT_ACCESSIBLE_FROM_TRAIT, "Superclass is not accessible from interface");
         MAP.put(AMBIGUOUS_SUPER, "Many supertypes available, please specify the one you mean in angle brackets, e.g. 'super<Foo>'");
         MAP.put(ABSTRACT_SUPER_CALL, "Abstract member cannot be accessed directly");
         MAP.put(NOT_A_SUPERTYPE, "Not a supertype");
@@ -308,7 +308,7 @@ public class DefaultErrorMessages {
         MAP.put(INACCESSIBLE_OUTER_CLASS_EXPRESSION, "Expression is inaccessible from a nested class ''{0}'', use ''inner'' keyword to make the class inner", NAME);
         MAP.put(NESTED_CLASS_NOT_ALLOWED, "Nested class is not allowed here, use ''inner'' keyword to make the class inner");
 
-        MAP.put(INNER_CLASS_IN_TRAIT, "Inner classes are not allowed in traits");
+        MAP.put(INNER_CLASS_IN_TRAIT, "Inner classes are not allowed in interfaces");
         MAP.put(INNER_CLASS_IN_OBJECT, "Inner classes are not allowed in objects");
 
         MAP.put(HAS_NEXT_MISSING, "hasNext() cannot be called on iterator() of type ''{0}''", RENDER_TYPE);
@@ -384,11 +384,11 @@ public class DefaultErrorMessages {
         MAP.put(CYCLIC_INHERITANCE_HIERARCHY, "There's a cycle in the inheritance hierarchy for this type");
 
         MAP.put(MANY_CLASSES_IN_SUPERTYPE_LIST, "Only one class may appear in a supertype list");
-        MAP.put(SUPERTYPE_NOT_A_CLASS_OR_TRAIT, "Only classes and traits may serve as supertypes");
-        MAP.put(SUPERTYPE_INITIALIZED_IN_TRAIT, "Traits cannot initialize supertypes");
+        MAP.put(SUPERTYPE_NOT_A_CLASS_OR_TRAIT, "Only classes and interfaces may serve as supertypes");
+        MAP.put(SUPERTYPE_INITIALIZED_IN_TRAIT, "Interfaces cannot initialize supertypes");
         MAP.put(CLASS_IN_SUPERTYPE_FOR_ENUM, "Enum class cannot inherit from classes");
-        MAP.put(CONSTRUCTOR_IN_TRAIT, "A trait may not have a constructor");
-        MAP.put(TRAIT_WITH_SUPERCLASS, "Specifying a required base class for trait implementations is deprecated");
+        MAP.put(CONSTRUCTOR_IN_TRAIT, "An interface may not have a constructor");
+        MAP.put(TRAIT_WITH_SUPERCLASS, "Specifying a required base class for interface implementations is deprecated");
         MAP.put(SUPERTYPE_APPEARS_TWICE, "A supertype appears twice");
         MAP.put(FINAL_SUPERTYPE, "This type is final, so it cannot be inherited from");
         MAP.put(SINGLETON_IN_SUPERTYPE, "Cannot inherit from a singleton");
@@ -414,7 +414,7 @@ public class DefaultErrorMessages {
         MAP.put(NOT_A_LOOP_LABEL, "The label ''{0}'' does not denote a loop", STRING);
         MAP.put(NOT_A_RETURN_LABEL, "The label ''{0}'' does not reference to a context from which we can return", STRING);
 
-        MAP.put(ANONYMOUS_INITIALIZER_IN_TRAIT, "Anonymous initializers are not allowed in traits");
+        MAP.put(ANONYMOUS_INITIALIZER_IN_TRAIT, "Anonymous initializers are not allowed in interfaces");
         MAP.put(NULLABLE_SUPERTYPE, "A supertype cannot be nullable");
         MAP.put(DYNAMIC_SUPERTYPE, "A supertype cannot be dynamic");
         MAP.put(REDUNDANT_NULLABLE, "Redundant '?'");
@@ -438,7 +438,7 @@ public class DefaultErrorMessages {
         MAP.put(SMARTCAST_IMPOSSIBLE,
                 "Smart cast to ''{0}'' is impossible, because ''{1}'' could have changed since the is-check", RENDER_TYPE, STRING);
 
-        MAP.put(VARIANCE_ON_TYPE_PARAMETER_OF_FUNCTION_OR_PROPERTY, "Variance annotations are only allowed for type parameters of classes and traits");
+        MAP.put(VARIANCE_ON_TYPE_PARAMETER_OF_FUNCTION_OR_PROPERTY, "Variance annotations are only allowed for type parameters of classes and interfaces");
         MAP.put(TYPE_VARIANCE_CONFLICT, "Type parameter {0} is declared as ''{1}'' but occurs in ''{2}'' position in type {3}",
                 new MultiRenderer<VarianceConflictDiagnosticData>() {
                     @NotNull

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt

@@ -17,7 +17,7 @@ internal final class A {
     }
 }
 
-internal trait B {
+internal interface B {
     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/checkerTestUtil/test_with_diagnostic.txt

@@ -13,7 +13,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Pa</*0*/ X, /*1*/ Y> {
+internal interface Pa</*0*/ X, /*1*/ Y> {
     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/AbstractInTrait.txt

@@ -2,7 +2,7 @@ package
 
 package abstract {
 
-    internal trait MyTrait {
+    internal interface MyTrait {
         internal abstract val a: kotlin.Int
         internal open val a1: kotlin.Int = 1
         internal abstract val a2: kotlin.Int

compiler/testData/diagnostics/tests/AnonymousInitializers.txt

 package
 
-internal trait NoC {
+internal interface NoC {
     internal open val a: 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/BreakContinue.txt

-package 
+package
 
 internal final class C {
     public constructor C()

compiler/testData/diagnostics/tests/BreakContinueInWhen.txt

-package 
+package
 
 internal fun breakContinueInWhen(/*0*/ i: kotlin.Int): kotlin.Unit
 internal fun breakContinueInWhenWithDoWhile(/*0*/ i: kotlin.Int, /*1*/ j: kotlin.Int): kotlin.Unit

compiler/testData/diagnostics/tests/Builders.txt

@@ -84,7 +84,7 @@ package html {
         internal final override /*1*/ /*fake_override*/ fun kotlin.String.plus(): kotlin.Unit
     }
 
-    internal trait Element {
+    internal interface Element {
         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 render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit

compiler/testData/diagnostics/tests/CovariantOverrideType.txt

 package
 
-internal trait A {
+internal interface A {
     internal abstract val a: kotlin.Int
     internal abstract val a1: kotlin.Int
     internal abstract val </*0*/ T> g: kotlin.Iterator<T>

compiler/testData/diagnostics/tests/DeferredTypes.txt

 package
 
-internal trait T {
+internal interface T {
     internal open val a: [ERROR : <ERROR FUNCTION RETURN TYPE>]
     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/DiamondFunction.txt

 package
 
-internal trait Base {
+internal interface Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun f(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,7 +23,7 @@ internal open class Left : Base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Right : Base {
+internal interface Right : Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*1*/ /*fake_override*/ fun f(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/DiamondFunctionGeneric.txt

 package
 
-internal trait Base</*0*/ P> {
+internal interface Base</*0*/ P> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun f(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,7 +23,7 @@ internal open class Left</*0*/ P> : Base<P> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Right</*0*/ P> : Base<P> {
+internal interface Right</*0*/ P> : Base<P> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*1*/ /*fake_override*/ fun f(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/DiamondProperty.txt

 package
 
-internal trait Base {
+internal interface Base {
     internal open var v: 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
@@ -23,7 +23,7 @@ internal open class Left : Base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Right : Base {
+internal interface Right : Base {
     internal open override /*1*/ /*fake_override*/ var v: 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/GenericArgumentConsistency.txt

 package
 
-internal trait A</*0*/ in T> {
+internal interface A</*0*/ in 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 A1</*0*/ out T> {
+internal interface A1</*0*/ out 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 B</*0*/ T> : A<kotlin.Int> {
+internal interface B</*0*/ T> : A<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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait B1 : A1<kotlin.Int> {
+internal interface B1 : A1<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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait B2 : A1<kotlin.Any>, B1 {
+internal interface B2 : A1<kotlin.Any>, B1 {
     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 BA1</*0*/ T> {
+internal interface BA1</*0*/ 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 BB1 : BA1<kotlin.Int> {
+internal interface BB1 : BA1<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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait BB2 : BA1<kotlin.Any>, BB1 {
+internal interface BB2 : BA1<kotlin.Any>, BB1 {
     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 C</*0*/ T> : B<T>, A<T> {
+internal interface C</*0*/ T> : B<T>, A<T> {
     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 C1</*0*/ T> : B<T>, A<kotlin.Any> {
+internal interface C1</*0*/ T> : B<T>, A<kotlin.Any> {
     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 D : C<kotlin.Boolean>, B<kotlin.Double> {
+internal interface D : C<kotlin.Boolean>, B<kotlin.Double> {
     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
@@ -68,25 +68,25 @@ internal trait D : C<kotlin.Boolean>, B<kotlin.Double> {
 
 package sx2 {
 
-    internal trait AA1</*0*/ in T> {
+    internal interface AA1</*0*/ in 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 AB1 : sx2.AA1<kotlin.Int> {
+    internal interface AB1 : sx2.AA1<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB2 : sx2.AA1<kotlin.Number>, sx2.AB1, sx2.AB3 {
+    internal interface AB2 : sx2.AA1<kotlin.Number>, sx2.AB1, sx2.AB3 {
         public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB3 : sx2.AA1<kotlin.Comparable<kotlin.Int>> {
+    internal interface AB3 : sx2.AA1<kotlin.Comparable<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -95,25 +95,25 @@ package sx2 {
 
 package x {
 
-    internal trait AA1</*0*/ out T> {
+    internal interface AA1</*0*/ out 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 AB1 : x.AA1<kotlin.Int> {
+    internal interface AB1 : x.AA1<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB2 : x.AA1<kotlin.Number>, x.AB1, x.AB3 {
+    internal interface AB2 : x.AA1<kotlin.Number>, x.AB1, x.AB3 {
         public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB3 : x.AA1<kotlin.Comparable<kotlin.Int>> {
+    internal interface AB3 : x.AA1<kotlin.Comparable<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -122,25 +122,25 @@ package x {
 
 package x2 {
 
-    internal trait AA1</*0*/ out T> {
+    internal interface AA1</*0*/ out 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 AB1 : x2.AA1<kotlin.Any> {
+    internal interface AB1 : x2.AA1<kotlin.Any> {
         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 AB2 : x2.AA1<kotlin.Number>, x2.AB1, x2.AB3 {
+    internal interface AB2 : x2.AA1<kotlin.Number>, x2.AB1, x2.AB3 {
         public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB3 : x2.AA1<kotlin.Comparable<kotlin.Int>> {
+    internal interface AB3 : x2.AA1<kotlin.Comparable<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -149,25 +149,25 @@ package x2 {
 
 package x3 {
 
-    internal trait AA1</*0*/ in T> {
+    internal interface AA1</*0*/ in 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 AB1 : x3.AA1<kotlin.Any> {
+    internal interface AB1 : x3.AA1<kotlin.Any> {
         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 AB2 : x3.AA1<kotlin.Number>, x3.AB1, x3.AB3 {
+    internal interface AB2 : x3.AA1<kotlin.Number>, x3.AB1, x3.AB3 {
         public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait AB3 : x3.AA1<kotlin.Comparable<kotlin.Int>> {
+    internal interface AB3 : x3.AA1<kotlin.Comparable<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
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/MultipleBounds.txt

@@ -16,7 +16,7 @@ package Jet87 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait B {
+    internal interface B {
         internal open fun bar(): kotlin.Double
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -69,7 +69,7 @@ package Jet87 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait G</*0*/ X> {
+    internal interface G</*0*/ X> {
         internal abstract val </*0*/ A : Jet87.B> bal: kotlin.Double
         internal abstract val </*0*/ Y : Jet87.B> bas: kotlin.Double
         internal abstract val </*0*/ X : Jet87.A> boo: kotlin.Double where X : Jet87.B

compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-internal trait Aaa</*0*/ T> {
+internal interface Aaa</*0*/ 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

compiler/testData/diagnostics/tests/OverridingVarByVal.txt

@@ -24,7 +24,7 @@ internal final class Var2 : Var {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait VarT {
+internal interface VarT {
     internal abstract var v: 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/ProjectionsInSupertypes.txt

 package
 
-internal trait A</*0*/ T> {
+internal interface A</*0*/ 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 B</*0*/ T> {
+internal interface B</*0*/ 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 C</*0*/ T> {
+internal interface C</*0*/ 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 D</*0*/ T> {
+internal interface D</*0*/ 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 Test : A<in kotlin.Int>, B<out kotlin.Int>, C<*>?, D<kotlin.Int> {
+internal interface Test : A<in kotlin.Int>, B<out kotlin.Int>, C<*>?, D<kotlin.Int> {
     public open override /*4*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*4*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*4*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.txt

-package 
+package
 
 internal val classLiteral: [ERROR : Unresolved class]
 internal val memberFun: [ERROR : Type for A::baz]

compiler/testData/diagnostics/tests/SelfTypesUnsupported.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(/*0*/ f: [ERROR : This]): kotlin.Unit
 
-internal trait C</*0*/ T : C<[ERROR : This]>> {
+internal interface C</*0*/ T : C<[ERROR : This]>> {
     internal abstract val x: [ERROR : This]
     internal abstract val y: [ERROR : This]?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/SupertypeListChecks.txt

@@ -70,55 +70,55 @@ internal open class OC1 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T1 {
+internal interface T1 {
     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 T2</*0*/ T> {
+internal interface T2</*0*/ 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 Test {
+internal interface Test {
     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 Test1 : C2 {
+internal interface Test1 : C2 {
     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 Test2 : C2 {
+internal interface Test2 : C2 {
     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 Test3 : C2, C3 {
+internal interface Test3 : C2, C3 {
     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 Test4 : T1 {
+internal interface Test4 : T1 {
     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 Test5 : T1, T1 {
+internal interface Test5 : T1, T1 {
     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 Test6 : C1 {
+internal interface Test6 : C1 {
     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/TraitOverrideObjectMethods.txt

 package
 
-internal trait MyTrait : java.lang.Object {
+internal interface MyTrait : java.lang.Object {
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any!): kotlin.Boolean
     public abstract override /*1*/ fun finalize(): kotlin.Unit

compiler/testData/diagnostics/tests/TraitWithConstructor.txt

@@ -8,7 +8,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T1 {
+internal interface T1 {
     public constructor T1(/*0*/ x: kotlin.String)
     internal final val x: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -16,20 +16,20 @@ internal trait T1 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T2 {
+internal interface T2 {
     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 T3 {
+internal interface T3 {
     public constructor T3(/*0*/ a: 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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T4 {
+internal interface T4 {
     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/UnusedVariables.txt

@@ -32,7 +32,7 @@ package unused_variables {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait Trait {
+    internal interface Trait {
         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/annotations/annotationInheritance.txt

@@ -37,7 +37,7 @@ internal open class C {
     public open override /*1*/ /*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 open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/annotations/annotationModifier.txt

@@ -32,7 +32,7 @@ internal object O {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T : kotlin.Annotation {
+internal interface T : kotlin.Annotation {
     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/annotations/bracketsDeprecation.txt

@@ -24,13 +24,13 @@ internal final annotation class Ann : kotlin.Annotation {
     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
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait D : B {
+internal interface D : B {
     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/annotations/onInitializer.txt

@@ -7,7 +7,7 @@ internal final class A {
     public open override /*1*/ /*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 open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt

-package 
+package
 
 internal fun [[ERROR : x]()] A.foo(/*0*/ a: [[ERROR : x]()] kotlin.Int): kotlin.Unit
 

compiler/testData/diagnostics/tests/cast/DowncastMap.txt

@@ -2,13 +2,13 @@ package
 
 internal fun p(/*0*/ p: Map<kotlin.String, kotlin.Int>): kotlin.Unit
 
-internal trait Map</*0*/ K, /*1*/ out V> {
+internal interface Map</*0*/ K, /*1*/ out V> {
     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 MutableMap</*0*/ K, /*1*/ V> : Map<K, V> {
+internal interface MutableMap</*0*/ K, /*1*/ V> : Map<K, V> {
     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 set(/*0*/ k: K, /*1*/ v: V): kotlin.Unit

compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.txt

@@ -2,37 +2,37 @@ package
 
 internal fun test(/*0*/ t: BaseSuper<B>): kotlin.Boolean
 
-internal trait A {
+internal interface A {
     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 {
     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 BaseImpl : BaseSuper<D> {
+internal interface BaseImpl : BaseSuper<D> {
     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 BaseSuper</*0*/ out T> {
+internal interface BaseSuper</*0*/ out 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 D {
+internal interface D {
     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 DerivedSuper</*0*/ out S> : BaseSuper<S>, BaseImpl {
+internal interface DerivedSuper</*0*/ out S> : BaseSuper<S>, BaseImpl {
     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

compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.txt

@@ -2,19 +2,19 @@ package
 
 internal fun </*0*/ T : Base<A>> test(/*0*/ a: Base<B>): kotlin.Boolean
 
-internal trait A {
+internal interface A {
     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 {
     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 Base</*0*/ T> {
+internal interface Base</*0*/ 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

compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.txt

@@ -2,13 +2,13 @@ package
 
 internal fun testing(/*0*/ a: A): B
 
-internal trait A {
+internal interface A {
     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 {
     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/cast/IsTraits.txt

@@ -2,13 +2,13 @@ package
 
 internal fun f(/*0*/ a: Aaa): kotlin.Boolean
 
-internal trait Aaa {
+internal interface Aaa {
     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 Bbb {
+internal interface Bbb {
     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/cast/bare/AsNestedBare.txt

@@ -3,13 +3,13 @@ package
 internal fun test(/*0*/ tr: Tr): kotlin.Any
 internal fun test1(/*0*/ tr: Tr): kotlin.Any
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/AsNullable.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr<kotlin.String>): kotlin.Unit
 
-internal trait G</*0*/ T> : Tr<T> {
+internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
+internal interface Tr</*0*/ 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

compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr): kotlin.Unit
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/EitherAs.txt

@@ -19,19 +19,19 @@ internal final class C2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Either</*0*/ out A, /*1*/ out B> {
+internal interface Either</*0*/ out A, /*1*/ out B> {
     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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
+internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
     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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
+internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
     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/cast/bare/EitherIs.txt

@@ -19,20 +19,20 @@ internal final class C2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Either</*0*/ out A, /*1*/ out B> {
+internal interface Either</*0*/ out A, /*1*/ out B> {
     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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
+internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
     internal abstract val value: A
     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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
+internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
     internal abstract val value: B
     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/cast/bare/EitherNotIs.txt

@@ -19,20 +19,20 @@ internal final class C2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Either</*0*/ out A, /*1*/ out B> {
+internal interface Either</*0*/ out A, /*1*/ out B> {
     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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
+internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
     internal abstract val value: A
     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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
+internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
     internal abstract val value: B
     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/cast/bare/EitherSafeAs.txt

@@ -19,19 +19,19 @@ internal final class C2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Either</*0*/ out A, /*1*/ out B> {
+internal interface Either</*0*/ out A, /*1*/ out B> {
     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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
+internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
     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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
+internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
     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/cast/bare/EitherWhen.txt

@@ -18,20 +18,20 @@ internal final class C2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Either</*0*/ out A, /*1*/ out B> {
+internal interface Either</*0*/ out A, /*1*/ out B> {
     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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
+internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
     internal abstract val value: A
     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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
+internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
     internal abstract val value: B
     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/cast/bare/ErrorsInSubstitution.txt

@@ -2,13 +2,13 @@ package
 
 internal fun f(/*0*/ p: B<[ERROR : Foo]>): kotlin.Any
 
-internal trait B</*0*/ T> {
+internal interface B</*0*/ 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 G</*0*/ T> : B<T> {
+internal interface G</*0*/ T> : B<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

compiler/testData/diagnostics/tests/cast/bare/NullableAs.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr<kotlin.String>?): kotlin.Unit
 
-internal trait G</*0*/ T> : Tr<T> {
+internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
+internal interface Tr</*0*/ 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

compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr?): kotlin.Unit
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/NullableAsNullable.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr<kotlin.String>?): kotlin.Unit
 
-internal trait G</*0*/ T> : Tr<T> {
+internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
+internal interface Tr</*0*/ 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

compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr?): kotlin.Unit
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/RedundantNullable.txt

@@ -2,7 +2,7 @@ package
 
 internal fun f(/*0*/ b: B<kotlin.String>?): kotlin.Boolean
 
-internal trait B</*0*/ T> {
+internal interface B</*0*/ 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

compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr): kotlin.Unit
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/UnrelatedColon.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr): [ERROR : G]
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/bare/UnrelatedIs.txt

@@ -2,13 +2,13 @@ package
 
 internal fun test(/*0*/ tr: Tr): kotlin.Boolean
 
-internal trait G</*0*/ T> {
+internal interface G</*0*/ 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 Tr {
+internal interface Tr {
     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/cast/isErasedUnrelatedAndStarred.txt

@@ -9,7 +9,7 @@ internal final class G</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Tr {
+internal interface Tr {
     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/cast/neverSucceeds/NoGenericsRelated.txt

@@ -23,31 +23,31 @@ internal open class OC2 : OC1, T2 {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T1 {
+internal interface T1 {
     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 T2 {
+internal interface T2 {
     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 T3 {
+internal interface T3 {
     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 T4 : OC1 {
+internal interface T4 : OC1 {
     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 T5 : T2 {
+internal interface T5 : T2 {
     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/cast/neverSucceeds/NoGenericsUnrelated.txt

@@ -30,13 +30,13 @@ internal open class OClass2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Trait1 {
+internal interface Trait1 {
     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 Trait2 {
+internal interface Trait2 {
     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/checkType.txt

@@ -2,19 +2,19 @@ package
 
 internal fun test(/*0*/ b: B): kotlin.Unit
 
-internal trait A {
+internal interface A {
     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 {
     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 C : B {
+internal interface C : B {
     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/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.txt

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.txt

@@ -2,19 +2,19 @@ package
 
 private fun transformClassifierType(/*0*/ classifierType: JavaClassifierType, /*1*/ howThisTypeIsUsed: TypeUsage): JetType?
 
-internal trait JavaClassifierType {
+internal interface JavaClassifierType {
     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 JetType {
+internal interface JetType {
     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 TypeUsage {
+internal interface TypeUsage {
     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/controlFlowAnalysis/kt1191.txt

@@ -4,7 +4,7 @@ package kt1191 {
     internal fun foo(/*0*/ unused: kotlin.Int): kotlin.Any
     internal fun </*0*/ T> kt1191.FunctionalList<T>.plus(/*0*/ element: T): kt1191.FunctionalList<T>
 
-    internal trait FunctionalList</*0*/ T> {
+    internal interface FunctionalList</*0*/ T> {
         internal abstract val head: T
         internal abstract val size: kotlin.Int
         internal abstract val tail: kt1191.FunctionalList<T>

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.txt

@@ -3,7 +3,7 @@ package
 package a {
     internal fun foo(/*0*/ b: a.B): kotlin.Int
 
-    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.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.txt

@@ -3,7 +3,7 @@ package
 internal val m: X
 internal fun box(): kotlin.Unit
 
-internal trait X {
+internal interface X {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun f(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/controlStructures/commonSupertypeOfT.txt

@@ -3,7 +3,7 @@ package
 internal fun </*0*/ T : Tr> fn(/*0*/ t1: T, /*1*/ t2: T?): kotlin.Unit
 internal fun </*0*/ T : kotlin.Any> fn(/*0*/ t1: T, /*1*/ t2: T?): kotlin.Unit
 
-internal trait Tr {
+internal interface Tr {
     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/cyclicHierarchy/cyclicHierarchy.txt

@@ -10,34 +10,34 @@ internal val g: G? = null
 internal val h: H? = null
 internal fun test(): kotlin.Unit
 
-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.Unit
     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 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*1*/ /*fake_override*/ 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 C {
+internal interface C {
 }
 
-internal trait D {
+internal interface D {
 }
 
-internal trait E {
+internal interface E {
 }
 
-internal trait F {
+internal interface F {
 }
 
-internal trait G : F {
+internal interface G : F {
 }
 
-internal trait H : F {
+internal interface H : F {
 }

compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.txt

 package
 
-public/*package*/ trait A : C {
+public/*package*/ interface A : C {
     internal abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
     public abstract fun foo(): kotlin.Unit
 }
 
-internal trait B {
+internal interface B {
     internal abstract fun bar(): kotlin.Unit
 }
 
-public/*package*/ trait C : B {
+public/*package*/ interface C : B {
     internal abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
     public abstract fun baz(): kotlin.Unit
 }

compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.txt

 package
 
-internal trait ExceptionTracker {
+internal interface ExceptionTracker {
 }
 
 public/*package*/ open class LockBasedStorageManager : StorageManager {
     public/*package*/ constructor LockBasedStorageManager()
     java.lang.Override() public/*package*/ open override /*1*/ fun foo(): kotlin.Unit
 
-    public/*package*/ trait ExceptionHandlingStrategy {
+    public/*package*/ interface ExceptionHandlingStrategy {
         public abstract fun bar(): 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
@@ -18,6 +18,6 @@ public/*package*/ open class LockBasedStorageManager : StorageManager {
     public/*package*/ final /*synthesized*/ fun ExceptionHandlingStrategy(/*0*/ function: () -> kotlin.Unit): LockBasedStorageManager.ExceptionHandlingStrategy
 }
 
-internal trait StorageManager {
+internal interface StorageManager {
     internal abstract fun foo(): kotlin.Unit
 }

compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt

@@ -10,7 +10,7 @@ kotlin.data() internal final class A : T {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T {
+internal interface T {
     internal abstract fun component1(): 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/dataClasses/implementTraitWhichHasFinalComponent1.txt

@@ -10,7 +10,7 @@ kotlin.data() internal final class A : T {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T {
+internal interface T {
     internal final fun component1(): 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/dataFlow/WhenSubject.txt

@@ -10,7 +10,7 @@ internal final class BinOp : Expr {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Expr {
+internal interface Expr {
     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/dataFlow/local/LocalClassDelegation.txt

@@ -2,7 +2,7 @@ package
 
 internal fun test(/*0*/ d: kotlin.Any?): kotlin.Unit
 
-internal trait D {
+internal interface D {
     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/dataFlow/local/LocalClassFunctions.txt

@@ -2,7 +2,7 @@ package
 
 internal fun test(/*0*/ d: kotlin.Any?): kotlin.Unit
 
-internal trait D {
+internal interface D {
     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/dataFlow/local/LocalClassInitializer.txt

@@ -2,7 +2,7 @@ package
 
 internal fun f(/*0*/ a: kotlin.Any?): kotlin.Unit
 
-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.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(/*0*/ b: B?): kotlin.Int
 
-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.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.txt

@@ -5,7 +5,7 @@ internal fun foo2(/*0*/ a: kotlin.Int?, /*1*/ b: G): kotlin.Unit
 internal fun foo3(/*0*/ a: kotlin.Int?, /*1*/ b: G): kotlin.Unit
 internal fun foo4(/*0*/ a: kotlin.Int?, /*1*/ b: G): kotlin.Unit
 
-internal trait G {
+internal interface G {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun get(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.txt

@@ -4,13 +4,13 @@ internal fun bar1(/*0*/ a: A): kotlin.Unit
 internal fun bar2(/*0*/ a: A): kotlin.Unit
 internal fun id(/*0*/ b: B): B
 
-internal trait A {
+internal interface A {
     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 {
     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/dataFlowInfoTraversal/AssignmentInInitializer.txt

@@ -4,13 +4,13 @@ internal fun bar1(/*0*/ a: A): kotlin.Unit
 internal fun bar2(/*0*/ a: A): kotlin.Unit
 internal fun baz(/*0*/ b: B): B
 
-internal trait A {
+internal interface A {
     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 {
     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/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.txt

@@ -4,13 +4,13 @@ internal fun bar(/*0*/ a: A, /*1*/ b: B): kotlin.Boolean
 internal fun foo(/*0*/ a: A): kotlin.Boolean
 internal fun B.compareTo(/*0*/ b: B): kotlin.Int
 
-internal trait A {
+internal interface A {
     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 {
     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/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.txt

@@ -3,13 +3,13 @@ package
 internal fun foo1(/*0*/ a: A, /*1*/ b: B): kotlin.Boolean
 internal fun foo2(/*0*/ a: A, /*1*/ b: B): kotlin.Boolean
 
-internal trait A {
+internal interface A {
     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 {
     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/dataFlowInfoTraversal/BinaryExpressionPlusConvention.txt

@@ -4,13 +4,13 @@ internal fun bar(/*0*/ a: A, /*1*/ b: B): B
 internal fun foo(/*0*/ a: A): B
 internal fun B.plus(/*0*/ b: B): B
 
-internal trait A {
+internal interface A {
     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 {
     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/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.txt

@@ -2,7 +2,7 @@ package
 
 internal fun test(/*0*/ a: kotlin.Any?): kotlin.Unit
 
-internal trait B {
+internal interface B {
     internal open fun bar(): 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/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt

@@ -36,7 +36,7 @@ package example {
         public open override /*1*/ /*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 open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt

-package 
+package
 
 a() internal fun <no name provided>(): kotlin.Unit
 internal fun <no name provided>(): kotlin.Unit
@@ -6,13 +6,13 @@ internal fun outerFun(): kotlin.Unit
 internal fun A.<no name provided>(): kotlin.Unit
 internal fun [a()] A.<no name provided>(): kotlin.Unit
 
-internal trait A {
+internal interface A {
     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 {
     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/declarationChecks/ambiguousObjectExpressionType.txt

@@ -54,7 +54,7 @@ internal open class MyClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait MyTrait {
+internal interface MyTrait {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun f1(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt

@@ -77,7 +77,7 @@ internal open enum class C : kotlin.Enum<C> {
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
-internal trait D {
+internal interface D {
     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/declarationChecks/kt1141.txt

@@ -20,7 +20,7 @@ package kt1141 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    public trait SomeTrait {
+    public interface SomeTrait {
         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/declarationChecks/kt2397.txt

@@ -10,7 +10,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait T {
+    internal interface T {
         internal final val b: kotlin.Int
         internal final val c: kotlin.Int
         internal final val d: kotlin.Int = 1

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-internal trait A {
+internal interface A {
     internal abstract val prop: 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/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-internal trait A {
+internal interface A {
     internal abstract val prop: 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/delegatedProperty/inTrait.txt

@@ -8,7 +8,7 @@ internal final class Delegate {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait T {
+internal interface T {
     internal open val a: 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/delegatedProperty/inference/differentDelegatedExpressions.txt

@@ -32,7 +32,7 @@ package baz {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait MyPropertyContainer {
+    internal interface MyPropertyContainer {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal abstract fun </*0*/ R, /*1*/ T> getMyProperty(): baz.MyProperty<R, T>
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -47,7 +47,7 @@ package baz {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait Outer {
+    internal interface Outer {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal abstract fun getContainer(): baz.MyPropertyContainer
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.txt

@@ -38,7 +38,7 @@ package override {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait G</*0*/ T> {
+    internal interface G</*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
@@ -69,7 +69,7 @@ package override {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal trait T {
+    internal interface T {
         internal abstract val v: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal abstract fun foo(): kotlin.Unit

compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.txt

@@ -4,7 +4,7 @@ internal fun </*0*/ T> bar(): A<T>
 internal fun </*0*/ T> baz(/*0*/ f: (T) -> T): A<T>
 internal fun </*0*/ T> boo(/*0*/ t: T): A<T>
 
-internal trait A</*0*/ T> {
+internal interface A</*0*/ T> {
     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/delegation/DelegationNotTotrait.txt

@@ -45,7 +45,7 @@ internal open class Foo {
     public open override /*1*/ /*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 open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.txt

 package
 
-internal trait One {
+internal interface One {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -73,14 +73,14 @@ internal final class Test321 : Three, Two, One {
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Three {
+internal interface Three {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract 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 Two {
+internal interface Two {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.txt

@@ -2,7 +2,7 @@ package
 
 internal fun b(/*0*/ c: C): kotlin.Unit
 
-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.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.txt

 package
 
-internal trait One {
+internal interface One {
     private final fun boo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract fun foo(): kotlin.Int
@@ -8,7 +8,7 @@ internal trait One {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait OneImpl : One {
+internal interface OneImpl : One {
     invisible_fake final override /*1*/ /*fake_override*/ fun boo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.Int
@@ -43,14 +43,14 @@ internal final class Test3 : Two, One {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait Two {
+internal interface Two {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract 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 TwoImpl : Two {
+internal interface TwoImpl : Two {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.txt

 package
 
-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.Unit
     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 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/deprecated/typeUsage.txt

@@ -25,7 +25,7 @@ internal final class Derived2 : Derived {
     internal final override /*1*/ /*fake_override*/ fun use(): kotlin.Unit
 }
 
-internal trait Generic</*0*/ T> {
+internal interface Generic</*0*/ 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

compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt

 package
 
-internal trait B {
+internal interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun getX(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,7 +16,7 @@ internal final class C : D, B {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-internal trait D {
+internal interface D {
     internal abstract val x: 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/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt

 package
 
-internal trait B {
+internal interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal open fun getX(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int