Fix testData in compiler: add collections and ranges package to fq-names.
This commit is contained in:
compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt
Vendored
+2
-2
@@ -1,6 +1,6 @@
|
||||
package
|
||||
|
||||
package g {
|
||||
public fun </*0*/ T, /*1*/ C : kotlin.Collection<T>> convert(/*0*/ src: kotlin.Collection<T>, /*1*/ dest: C): C
|
||||
public fun test(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
|
||||
public fun </*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> convert(/*0*/ src: kotlin.collections.Collection<T>, /*1*/ dest: C): C
|
||||
public fun test(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
|
||||
}
|
||||
|
||||
+9
-9
@@ -1,13 +1,13 @@
|
||||
package
|
||||
|
||||
package a {
|
||||
public fun </*0*/ T> emptyList(): kotlin.List<T>
|
||||
public fun </*0*/ T : a.A> emptyListOfA(): kotlin.List<T>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap(): kotlin.Map<T, R>
|
||||
public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap1(/*0*/ t: T): kotlin.Map<T, R>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap2(/*0*/ t: T): kotlin.Map<T, R>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap3(/*0*/ r: R): kotlin.Map<T, R>
|
||||
public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap4(/*0*/ l: kotlin.MutableList<T>): kotlin.Map<T, R>
|
||||
public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
|
||||
public fun </*0*/ T : a.A> emptyListOfA(): kotlin.collections.List<T>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap(): kotlin.collections.Map<T, R>
|
||||
public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap1(/*0*/ t: T): kotlin.collections.Map<T, R>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap2(/*0*/ t: T): kotlin.collections.Map<T, R>
|
||||
public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap3(/*0*/ r: R): kotlin.collections.Map<T, R>
|
||||
public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap4(/*0*/ l: kotlin.collections.MutableList<T>): kotlin.collections.Map<T, R>
|
||||
public fun </*0*/ U, /*1*/ V : U> foo(): U
|
||||
public fun test1(): kotlin.Unit
|
||||
public fun test2(): kotlin.Unit
|
||||
@@ -15,8 +15,8 @@ package a {
|
||||
public fun test4(): kotlin.Unit
|
||||
public fun test5(/*0*/ a: a.A): kotlin.Unit
|
||||
public fun test6(/*0*/ a: a.A): kotlin.Unit
|
||||
public fun test7(): kotlin.Map<a.A, a.A>
|
||||
public fun test7(/*0*/ list: kotlin.MutableList<kotlin.Int>): kotlin.Unit
|
||||
public fun test7(): kotlin.collections.Map<a.A, a.A>
|
||||
public fun test7(/*0*/ list: kotlin.collections.MutableList<kotlin.Int>): kotlin.Unit
|
||||
public fun test8(): kotlin.Int
|
||||
|
||||
public interface A {
|
||||
|
||||
@@ -3,5 +3,5 @@ package
|
||||
package d {
|
||||
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
|
||||
public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
|
||||
public inline fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
|
||||
public inline fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.collections.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
|
||||
}
|
||||
|
||||
Vendored
+4
-4
@@ -1,11 +1,11 @@
|
||||
package
|
||||
|
||||
package a {
|
||||
public fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
|
||||
public fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.collections.MutableList<T>
|
||||
public fun </*0*/ U, /*1*/ V : U> bar(/*0*/ v: V, /*1*/ u: U): U
|
||||
public fun </*0*/ V : U, /*1*/ U> baz(/*0*/ v: V, /*1*/ u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
|
||||
public fun </*0*/ T> checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.MutableList<T>): kotlin.Unit
|
||||
public fun </*0*/ V : U, /*1*/ U> baz(/*0*/ v: V, /*1*/ u: kotlin.collections.MutableSet<U>): kotlin.collections.MutableSet<U>
|
||||
public fun </*0*/ T> checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.collections.MutableList<T>): kotlin.Unit
|
||||
public fun </*0*/ V : U, /*1*/ U> foo(/*0*/ v: V, /*1*/ u: U): U
|
||||
public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.MutableSet<kotlin.String>): kotlin.Unit
|
||||
public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.String): kotlin.Unit
|
||||
public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.collections.MutableSet<kotlin.String>): kotlin.Unit
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user