Skip to content

Commit d700cd1

Browse files
nikitabobkoSpace Team
authored and
Space Team
committed
[FE] 1.9.20 exclusive commit. Fix testData after previous two commits
This is 1.9.20 exclusive commit. testData in 1.9.20 and master diverged so much that I need special commits for the release branch
1 parent 22b9d50 commit d700cd1

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

compiler/testData/diagnostics/tests/multiplatform/annotationMatching/typealiasToKtLibrary.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ actual typealias <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>MyDeprecatedNotMatch<!>
4040

4141
actual typealias MyDeprecatedMatch = kotlin.Deprecated
4242

43-
actual typealias <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING, ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>MyAbstractIterator<!><T> = AbstractIterator<T>
43+
actual typealias MyAbstractIterator<T> = AbstractIterator<T>

compiler/testData/multiplatform/genericDeclarations/output.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,3 @@ actual class C3<D, E : MutableList<in D>>
4141
compiler/testData/multiplatform/genericDeclarations/jvm.kt:15:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573
4242
actual abstract class AbstractList<F> : MutableList<F>, java.io.Serializable
4343
^
44-
compiler/testData/multiplatform/genericDeclarations/jvm.kt:15:17: warning: actual class 'AbstractList': actual class and its non-final expect class must declare exactly the same supertypes. Actual class declares the following supertypes that are not presented in expect class: 'Serializable'.
45-
This error happens because the expect class 'AbstractList' is non-final. This warning will become an error in future releases.
46-
Also see https://youtrack.jetbrains.com/issue/KT-22841 for more details
47-
actual abstract class AbstractList<F> : MutableList<F>, java.io.Serializable
48-
^

0 commit comments

Comments
 (0)