From e5e50eabe9ba08083b97240f5332805607a419c3 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 20 Jul 2020 07:04:22 +0300 Subject: [PATCH] Update testdata after 41a0cfe00249df02c9b5695f435a90677ef7fa68 --- .../tests/typealias/boundsViolationInTypeAliasExpansion.kt | 6 ++++-- .../tests/typealias/boundsViolationInTypeAliasExpansion.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt index df564a93c63..5a111b724b6 100644 --- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt +++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt @@ -6,7 +6,8 @@ class NumColl> class TColl> typealias NA = Num -typealias NL = NumColl> +typealias NL = NumColl> +typealias MMMM = NL typealias TC = TColl fun test1(x: NA) {} @@ -17,7 +18,8 @@ fun test4(x: NL) {} val test5 = NA() val test6 = NA<Any>() val test7 = NL() -val test8 = NL() +val test8 = MMMM<Int>() +val test9dwd = NL() fun test9(x: TC>) {} fun test10(x: TC>) {} diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt index 1c3143a1a67..491778beb3c 100644 --- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt +++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt @@ -7,7 +7,8 @@ public val test16: TC> /* = T public val test5: NA /* = Num */ public val test6: NA /* = Num */ public val test7: NL /* = NumColl> */ -public val test8: NL /* = NumColl> */ +public val test8: MMMM /* = NumColl> */ +public val test9dwd: NL /* = NumColl> */ public fun test1(/*0*/ x: NA /* = Num */): kotlin.Unit public fun test10(/*0*/ x: TC> /* = TColl> */): kotlin.Unit public fun test11(/*0*/ x: TC> /* = TColl> */): kotlin.Unit @@ -37,6 +38,7 @@ public final class TColl> { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } +public typealias MMMM = NL public typealias NA = Num -public typealias NL = NumColl> +public typealias NL = NumColl> public typealias TC = TColl