FIR: rename AMBIGUITY to OVERLOAD_RESOLUTION_AMBIGUITY to match FE 1.0
This commit is contained in:
+1
-1
@@ -5,5 +5,5 @@ fun <T> g(i: Int, a: Any): List<T> {throw Exception()}
|
||||
fun <T> g(a: Any, i: Int): Collection<T> {throw Exception()}
|
||||
|
||||
fun <T> test() {
|
||||
val c: List<T> = <!AMBIGUITY!>g<!>(1, 1)
|
||||
val c: List<T> = <!OVERLOAD_RESOLUTION_AMBIGUITY!>g<!>(1, 1)
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -4,4 +4,4 @@ package f
|
||||
fun <R> h(i: Int, a: Any, r: R, f: (Boolean) -> Int) = 1
|
||||
fun <R> h(a: Any, i: Int, r: R, f: (Boolean) -> Int) = 1
|
||||
|
||||
fun test() = <!AMBIGUITY!>h<!>(1, 1, 1, { b -> 42 })
|
||||
fun test() = <!OVERLOAD_RESOLUTION_AMBIGUITY!>h<!>(1, 1, 1, { b -> 42 })
|
||||
|
||||
Vendored
+1
-1
@@ -5,7 +5,7 @@ fun <T> f(i: Int, c: Collection<T>): List<T> {throw Exception()}
|
||||
fun <T> f(a: Any, l: List<T>): Collection<T> {throw Exception()}
|
||||
|
||||
fun <T> test(l: List<T>) {
|
||||
<!AMBIGUITY!>f<!>(1, emptyList())
|
||||
<!OVERLOAD_RESOLUTION_AMBIGUITY!>f<!>(1, emptyList())
|
||||
}
|
||||
|
||||
fun <T> emptyList(): List<T> {throw Exception()}
|
||||
|
||||
Vendored
+1
-1
@@ -5,7 +5,7 @@ package f
|
||||
fun <R> h(f: (Boolean) -> R) = 1
|
||||
fun <R> h(f: (String) -> R) = 2
|
||||
|
||||
fun test() = <!AMBIGUITY!>h<!>{ i -> getAnswer() }
|
||||
fun test() = <!OVERLOAD_RESOLUTION_AMBIGUITY!>h<!>{ i -> getAnswer() }
|
||||
|
||||
fun getAnswer() = 42
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -8,6 +8,6 @@ fun <T : Comparable<T>, S : T> greater(x: Bar<in S>, t: T): Int = 0
|
||||
fun <T : Comparable<T>, S : T> greater(x: Bar<in S>, other: Foo<T>): String = ""
|
||||
|
||||
fun test(b: Bar<Long>) {
|
||||
val result = <!AMBIGUITY!>greater<!>(b, b)
|
||||
val result = <!OVERLOAD_RESOLUTION_AMBIGUITY!>greater<!>(b, b)
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Ambiguity: greater, [/greater, /greater]")!>result<!>
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
fun foo() {
|
||||
fun bar1() = bar1()
|
||||
|
||||
fun bar2() = 1 <!AMBIGUITY!>+<!> bar2()
|
||||
fun bar2() = 1 <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> bar2()
|
||||
fun bar3() = <!INAPPLICABLE_CANDIDATE!>id<!>(bar3())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user