azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests after 395d595b

Browse Source
This commit is contained in:
Leonid Startsev
2019-10-09 19:13:55 +03:00
parent 93c91862f1
commit 1ed4930a2e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/multiplatform/incompatibleCallables/output.txt
Vendored
+12 -12
View File
@@ -5,73 +5,73 @@ Output:
-- JVM -- -- JVM --
Exit code: COMPILATION_ERROR Exit code: COMPILATION_ERROR
Output: Output:
compiler/testData/multiplatform/incompatibleCallables/common.kt:1:12: error: expected function 'f1' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:1:12: error: expected function 'f1' has no actual declaration in module <main> for JVM
The following declaration is incompatible because return type is different: The following declaration is incompatible because return type is different:
public actual fun f1(): String public actual fun f1(): String
expect fun f1() expect fun f1()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:5:14: error: expected function 'f3' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:5:14: error: expected function 'f3' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter types are different: The following declaration is incompatible because parameter types are different:
public actual fun f3(name: Double): Unit public actual fun f3(name: Double): Unit
expect fun f3(name: String) expect fun f3(name: String)
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:6:24: error: expected function 'f3ext' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:6:24: error: expected function 'f3ext' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter types are different: The following declaration is incompatible because parameter types are different:
public actual fun Double.f3ext(): Unit public actual fun Double.f3ext(): Unit
expect fun String.f3ext() expect fun String.f3ext()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:8:14: error: expected function 'f4' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:8:14: error: expected function 'f4' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter shapes are different (extension vs non-extension): The following declaration is incompatible because parameter shapes are different (extension vs non-extension):
public actual fun String.f4(): Unit public actual fun String.f4(): Unit
expect fun f4(name: String) expect fun f4(name: String)
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:10:12: error: expected function 'f5' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:10:12: error: expected function 'f5' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter shapes are different (extension vs non-extension): The following declaration is incompatible because parameter shapes are different (extension vs non-extension):
public actual fun f5(name: String): Unit public actual fun f5(name: String): Unit
expect fun String.f5() expect fun String.f5()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:12:14: error: expected function 'f6' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:12:14: error: expected function 'f6' has no actual declaration in module <main> for JVM
The following declaration is incompatible because number of value parameters is different: The following declaration is incompatible because number of value parameters is different:
public actual fun f6(p2: Int): Unit public actual fun f6(p2: Int): Unit
expect fun f6(p1: String, p2: Int) expect fun f6(p1: String, p2: Int)
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:14:12: error: expected function 'f7' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:14:12: error: expected function 'f7' has no actual declaration in module <main> for JVM
The following declaration is incompatible because number of type parameters is different: The following declaration is incompatible because number of type parameters is different:
public actual fun <K, V> f7(): Unit public actual fun <K, V> f7(): Unit
expect fun <T> f7() expect fun <T> f7()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:19:12: error: expected function 'f11' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:19:12: error: expected function 'f11' has no actual declaration in module <main> for JVM
The following declaration is incompatible because upper bounds of type parameters are different: The following declaration is incompatible because upper bounds of type parameters are different:
public actual fun <T : Annotation> f11(): Unit public actual fun <T : Annotation> f11(): Unit
expect fun <T : Number> f11() expect fun <T : Number> f11()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:20:12: error: expected function 'f12' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:20:12: error: expected function 'f12' has no actual declaration in module <main> for JVM
The following declaration is incompatible because upper bounds of type parameters are different: The following declaration is incompatible because upper bounds of type parameters are different:
public actual fun <U : MutableList<out String>> f12(): Unit public actual fun <U : MutableList<out String>> f12(): Unit
expect fun <U : MutableList<String>> f12() expect fun <U : MutableList<String>> f12()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:21:12: error: expected function 'f13' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:21:12: error: expected function 'f13' has no actual declaration in module <main> for JVM
The following declaration is incompatible because upper bounds of type parameters are different: The following declaration is incompatible because upper bounds of type parameters are different:
public actual fun <A, B : Comparable<B>> f13(): Unit public actual fun <A, B : Comparable<B>> f13(): Unit
expect fun <A, B : Comparable<A>> f13() expect fun <A, B : Comparable<A>> f13()
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:32:15: error: expected function 'f21' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:32:15: error: expected function 'f21' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter types are different: The following declaration is incompatible because parameter types are different:
public actual fun f21(c: Unit.() -> Unit): Unit public actual fun f21(c: Unit.() -> Unit): Unit
expect fun f21(c: suspend Unit.() -> Unit) expect fun f21(c: suspend Unit.() -> Unit)
^ ^
compiler/testData/multiplatform/incompatibleCallables/common.kt:33:15: error: expected function 'f22' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleCallables/common.kt:33:15: error: expected function 'f22' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter types are different: The following declaration is incompatible because parameter types are different:
public actual fun f22(c: suspend Unit.() -> Unit): Unit public actual fun f22(c: suspend Unit.() -> Unit): Unit
compiler/testData/multiplatform/incompatibleClasses/output.txt
Vendored
+3 -3
View File
@@ -5,19 +5,19 @@ Output:
-- JVM -- -- JVM --
Exit code: COMPILATION_ERROR Exit code: COMPILATION_ERROR
Output: Output:
compiler/testData/multiplatform/incompatibleClasses/common.kt:14:16: error: expected class 'C1' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleClasses/common.kt:14:16: error: expected class 'C1' has no actual declaration in module <main> for JVM
The following declaration is incompatible because number of type parameters is different: The following declaration is incompatible because number of type parameters is different:
public final actual class C1<A, Extra> public final actual class C1<A, Extra>
expect class C1<A> expect class C1<A>
^ ^
compiler/testData/multiplatform/incompatibleClasses/common.kt:16:16: error: expected class 'C3' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleClasses/common.kt:16:16: error: expected class 'C3' has no actual declaration in module <main> for JVM
The following declaration is incompatible because upper bounds of type parameters are different: The following declaration is incompatible because upper bounds of type parameters are different:
public final actual class C3<D, E : D?> public final actual class C3<D, E : D?>
expect class C3<D, E : D> expect class C3<D, E : D>
^ ^
compiler/testData/multiplatform/incompatibleClasses/common.kt:18:16: error: expected class 'C4' has no actual declaration in module <main> compiler/testData/multiplatform/incompatibleClasses/common.kt:18:16: error: expected class 'C4' has no actual declaration in module <main> for JVM
The following declaration is incompatible because upper bounds of type parameters are different: The following declaration is incompatible because upper bounds of type parameters are different:
public actual typealias C4<F> = C4Impl<F> public actual typealias C4<F> = C4Impl<F>
compiler/testData/multiplatform/missingOverload/output.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ Output:
-- JVM -- -- JVM --
Exit code: COMPILATION_ERROR Exit code: COMPILATION_ERROR
Output: Output:
compiler/testData/multiplatform/missingOverload/common.kt:7:13: error: expected function 'g' has no actual declaration in module <main> compiler/testData/multiplatform/missingOverload/common.kt:7:13: error: expected function 'g' has no actual declaration in module <main> for JVM
The following declaration is incompatible because parameter types are different: The following declaration is incompatible because parameter types are different:
public actual fun g(a: Any): Unit public actual fun g(a: Any): Unit
compiler/testData/multiplatform/optionalExpectationIncorrectUse/output.txt
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ fun useInSignature(a: A) = a.toString()
compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:9:1: error: this annotation is not applicable to target 'class' compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:9:1: error: this annotation is not applicable to target 'class'
@OptionalExpectation @OptionalExpectation
^ ^
compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:10:14: error: expected class 'NotAnAnnotationClass' has no actual declaration in module <main> compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:10:14: error: expected class 'NotAnAnnotationClass' has no actual declaration in module <main> for JVM
expect class NotAnAnnotationClass expect class NotAnAnnotationClass
^ ^
compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:12:1: error: '@OptionalExpectation' can only be used on an expected annotation class compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:12:1: error: '@OptionalExpectation' can only be used on an expected annotation class