fix tests in org.jetbrains.kotlin.checkers
This commit is contained in:
compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt
Vendored
+2
-2
@@ -1,6 +1,6 @@
|
||||
package
|
||||
|
||||
package g {
|
||||
internal fun </*0*/ T, /*1*/ C : kotlin.Collection<T>> convert(/*0*/ src: kotlin.Collection<T>, /*1*/ dest: C): C
|
||||
internal fun test(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
|
||||
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
|
||||
}
|
||||
|
||||
+18
-18
@@ -1,25 +1,25 @@
|
||||
package
|
||||
|
||||
package a {
|
||||
internal fun </*0*/ T> emptyList(): kotlin.List<T>
|
||||
internal fun </*0*/ T : a.A> emptyListOfA(): kotlin.List<T>
|
||||
internal fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap(): kotlin.Map<T, R>
|
||||
internal fun </*0*/ T, /*1*/ R : T> emptyStrangeMap1(/*0*/ t: T): kotlin.Map<T, R>
|
||||
internal fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap2(/*0*/ t: T): kotlin.Map<T, R> where R : a.A
|
||||
internal fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap3(/*0*/ r: R): kotlin.Map<T, R>
|
||||
internal fun </*0*/ T, /*1*/ R : T> emptyStrangeMap4(/*0*/ l: kotlin.MutableList<T>): kotlin.Map<T, R>
|
||||
internal fun </*0*/ U, /*1*/ V : U> foo(): U
|
||||
internal fun test1(): kotlin.Unit
|
||||
internal fun test2(): kotlin.Unit
|
||||
internal fun test3(): kotlin.Unit
|
||||
internal fun test4(): kotlin.Unit
|
||||
internal fun test5(/*0*/ a: a.A): kotlin.Unit
|
||||
internal fun test6(/*0*/ a: a.A): kotlin.Unit
|
||||
internal fun test7(): kotlin.Map<a.A, a.A>
|
||||
internal fun test7(/*0*/ list: kotlin.MutableList<kotlin.Int>): kotlin.Unit
|
||||
internal fun test8(): kotlin.Int
|
||||
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> where R : a.A
|
||||
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*/ U, /*1*/ V : U> foo(): U
|
||||
public fun test1(): kotlin.Unit
|
||||
public fun test2(): kotlin.Unit
|
||||
public fun test3(): kotlin.Unit
|
||||
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 test8(): kotlin.Int
|
||||
|
||||
internal interface A {
|
||||
public interface A {
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
|
||||
+9
-9
@@ -1,31 +1,31 @@
|
||||
package
|
||||
|
||||
package s {
|
||||
internal fun </*0*/ T : s.C> bar(/*0*/ in1: s.In<T>): T
|
||||
internal fun </*0*/ T> foo(/*0*/ in1: s.In<T>, /*1*/ in2: s.In<T>): T
|
||||
internal fun test(/*0*/ inA: s.In<s.A>): kotlin.Unit
|
||||
internal fun test(/*0*/ inA: s.In<s.A>, /*1*/ inB: s.In<s.B>, /*2*/ inC: s.In<s.C>): kotlin.Unit
|
||||
internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
|
||||
public fun </*0*/ T : s.C> bar(/*0*/ in1: s.In<T>): T
|
||||
public fun </*0*/ T> foo(/*0*/ in1: s.In<T>, /*1*/ in2: s.In<T>): T
|
||||
public fun test(/*0*/ inA: s.In<s.A>): kotlin.Unit
|
||||
public fun test(/*0*/ inA: s.In<s.A>, /*1*/ inB: s.In<s.B>, /*2*/ inC: s.In<s.C>): kotlin.Unit
|
||||
public fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
|
||||
|
||||
internal interface A {
|
||||
public interface A {
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
internal interface B {
|
||||
public interface B {
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
internal interface C : s.A, s.B {
|
||||
public interface C : s.A, s.B {
|
||||
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
internal interface In</*0*/ in T> {
|
||||
public interface In</*0*/ in T> {
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package
|
||||
|
||||
package d {
|
||||
internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
|
||||
internal fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
|
||||
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
|
||||
public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
|
||||
kotlin.inline() public fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,11 +1,11 @@
|
||||
package
|
||||
|
||||
internal fun </*0*/ T : kotlin.Any> foo(/*0*/ v: kotlin.Any): T?
|
||||
internal fun </*0*/ T : A> fooA(/*0*/ v: kotlin.Any): T?
|
||||
internal fun </*0*/ R : kotlin.Any> unescape(/*0*/ value: kotlin.Any): R?
|
||||
internal fun </*0*/ R : A> unescapeA(/*0*/ value: kotlin.Any): R?
|
||||
public fun </*0*/ T : kotlin.Any> foo(/*0*/ v: kotlin.Any): T?
|
||||
public fun </*0*/ T : A> fooA(/*0*/ v: kotlin.Any): T?
|
||||
public fun </*0*/ R : kotlin.Any> unescape(/*0*/ value: kotlin.Any): R?
|
||||
public fun </*0*/ R : A> unescapeA(/*0*/ value: kotlin.Any): R?
|
||||
|
||||
internal interface A {
|
||||
public interface A {
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
|
||||
+4
-4
@@ -1,23 +1,23 @@
|
||||
package
|
||||
|
||||
package Hello {
|
||||
internal fun test(): kotlin.Unit
|
||||
public fun test(): kotlin.Unit
|
||||
|
||||
internal open class Base</*0*/ T> {
|
||||
public open class Base</*0*/ T> {
|
||||
public constructor Base</*0*/ T>()
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
internal final class Client</*0*/ T, /*1*/ X : Hello.Base<T>> {
|
||||
public final class Client</*0*/ T, /*1*/ X : Hello.Base<T>> {
|
||||
public constructor Client</*0*/ T, /*1*/ X : Hello.Base<T>>(/*0*/ x: X)
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
internal final class StringBase : Hello.Base<kotlin.String> {
|
||||
public final class StringBase : Hello.Base<kotlin.String> {
|
||||
public constructor StringBase()
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
|
||||
Vendored
+7
-7
@@ -1,11 +1,11 @@
|
||||
package
|
||||
|
||||
package a {
|
||||
internal fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
|
||||
internal fun </*0*/ U, /*1*/ V : U> bar(/*0*/ v: V, /*1*/ u: U): U
|
||||
internal fun </*0*/ V : U, /*1*/ U> baz(/*0*/ v: V, /*1*/ u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
|
||||
internal fun </*0*/ T> checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.MutableList<T>): kotlin.Unit
|
||||
internal fun </*0*/ V : U, /*1*/ U> foo(/*0*/ v: V, /*1*/ u: U): U
|
||||
internal fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.MutableSet<kotlin.String>): kotlin.Unit
|
||||
internal fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.String): kotlin.Unit
|
||||
public fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.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> 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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user