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

Remove OI/NI attributes from test data

Browse Source
This commit is contained in:
Denis.Zharkov
2021-05-24 12:42:39 +03:00
committed by teamcityserver
parent 2ecba6ac39
commit ddbdfafa79
441 changed files with 1005 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ object X2
fun <T1> foo(x: T1, f: (T1) -> T1) = X1
fun <T2> foo(xf: () -> T2, f: (T2) -> T2) = X2
val test: X2 = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>({ 0 }, { <!CANNOT_INFER_PARAMETER_TYPE{OI}!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1 })
val test: X2 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>({ 0 }, { it -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+<!> 1 })
compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
Vendored
+2 -2
View File
@@ -14,6 +14,6 @@ fun <E> baz(x: String, y: E) {}
fun bar(x: A<String>) {
x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>("")
x.<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>baz<!>("", "")
<!OVERLOAD_RESOLUTION_AMBIGUITY!>baz<!>("", "")
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ fun <T2 : Closeable, R2> T2.myUse(f: (T2) -> R2): R2 = f(this)
fun test1(x: Closeable) = x.myUse { 42 }
fun test2(x: Closeable) = x.myUse<Closeable, Int> { 42 }
fun test3(x: Closeable) = x.myUse<<!UPPER_BOUND_VIOLATED{OI}!>AutoCloseable<!>, Int> { 42 } // TODO KT-10681
fun test3(x: Closeable) = x.myUse<AutoCloseable, Int> { 42 } // TODO KT-10681
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ fun <T> B<T>.foo(block: (T) -> Unit) {
}
fun main() {
B("string").<!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!> { }
B("string").<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
Vendored
+1 -1
View File
@@ -21,5 +21,5 @@ import a.*
import b.*
fun test() {
<!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!><A> { }
<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!><A> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
Vendored
+1 -1
View File
@@ -19,5 +19,5 @@ import a.*
import b.*
fun main() {
<!OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!><String> { }
foo<String> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ class A<T>
<!CONFLICTING_OVERLOADS!>fun <T1> A<T1>.foo()<!> = X1
<!CONFLICTING_OVERLOADS!>fun <T2> A<out T2>.foo()<!> = X2
fun <T> A<out T>.test() = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>() // TODO fix constraint system
fun <T> A<out T>.test() = <!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>() // TODO fix constraint system