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

Adjust test data after fixes about generic nullability

Browse Source
This commit is contained in:
Denis Zharkov
2015-08-07 15:17:16 +03:00
parent 4a3fbcc16e
commit e8f91e596c
24 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt
Vendored
+2 -2
View File
@@ -1,3 +1,4 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A
class B {
@@ -14,7 +15,6 @@ val cTopLevel: Int by Delegate<Nothing?>()
class Delegate<T> {
fun get(t: T, p: PropertyMetadata): Int {
t.equals(p) // to avoid UNUSED_PARAMETER warning
return 1
}
}
}
compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@ fun test5() {
fun <R: Any> R?.sure() : R = this!!
fun <T> test6(l: List<T>?) {
<!TYPE_MISMATCH!>l<!>.sure<T>()
<!TYPE_MISMATCH!>l<!>.sure<<!UPPER_BOUND_VIOLATED!>T<!>>()
}
compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ fun <T, Q> List<T>.map1(f: (T)-> Q): List<T>? = tail!!.map1(f)
fun <T, Q> List<T>.map2(f: (T)-> Q): List<T>? = tail.sure().map2(f)
fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!TYPE_MISMATCH!>tail<!>.sure<T>().<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)
fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!TYPE_MISMATCH!>tail<!>.sure<<!UPPER_BOUND_VIOLATED!>T<!>>().<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)