From b064c48f83996ebcff7520ef981635708f6b2537 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 28 Aug 2018 13:13:06 +0300 Subject: [PATCH] Fix testdata after advancing LATEST_STABLE to 1.3 This commit contains minor changes in testdata, where test and behavior change are not related --- compiler/testData/cli/jvm/kt19628_13.out | 1 - compiler/testData/codegen/box/enum/kt9711_2.kt | 2 +- compiler/testData/codegen/box/enum/objectInEnum.kt | 2 ++ .../argumentOrder/defaultParametersAndLastVararg.kt | 6 +++--- .../boxInline/argumentOrder/varargAndDefaultParameters.kt | 6 +++--- .../inlineFunctionsWithMatchingJvmSignatures/output.txt | 1 - .../testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt | 2 +- compiler/testData/multiplatform/inlineClasses/output.txt | 6 ++++++ 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/compiler/testData/cli/jvm/kt19628_13.out b/compiler/testData/cli/jvm/kt19628_13.out index b18ffbb7a97..d12d4f0b31b 100644 --- a/compiler/testData/cli/jvm/kt19628_13.out +++ b/compiler/testData/cli/jvm/kt19628_13.out @@ -1,4 +1,3 @@ -warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/kt19628_13.kt:5:29: error: unresolved reference: CollapsedStringAdapter @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class) ^ diff --git a/compiler/testData/codegen/box/enum/kt9711_2.kt b/compiler/testData/codegen/box/enum/kt9711_2.kt index 8642ed92784..cc576aaf05f 100644 --- a/compiler/testData/codegen/box/enum/kt9711_2.kt +++ b/compiler/testData/codegen/box/enum/kt9711_2.kt @@ -8,7 +8,7 @@ enum class IssueState { fun s() = "OK" - class D { + inner class D { val k = s() } }; diff --git a/compiler/testData/codegen/box/enum/objectInEnum.kt b/compiler/testData/codegen/box/enum/objectInEnum.kt index 9f19d3c1704..358dd3c2c64 100644 --- a/compiler/testData/codegen/box/enum/objectInEnum.kt +++ b/compiler/testData/codegen/box/enum/objectInEnum.kt @@ -1,3 +1,5 @@ +// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner + enum class E { ENTRY, SUBCLASS { diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt index 3d5c2f85e37..53757eaa705 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt @@ -25,7 +25,7 @@ fun box(): String { result = "" invokeOrder = "" - result = inlineFun(constraints = { invokeOrder += "constraints";A("C") }(), + result = inlineFun(constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()), receiver = { invokeOrder += " receiver"; "R" }(), init = { invokeOrder += " init"; "I" }()) if (result != "C, R, I") return "fail 1: $result" @@ -36,7 +36,7 @@ fun box(): String { result = "" invokeOrder = "" result = inlineFun(init = { invokeOrder += "init"; "I" }(), - constraints = { invokeOrder += "constraints";A("C") }(), + constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()), receiver = { invokeOrder += " receiver"; "R" }() ) if (result != "C, R, I") return "fail 3: $result" @@ -46,7 +46,7 @@ fun box(): String { result = "" invokeOrder = "" result = inlineFun(init = { invokeOrder += "init"; "I" }(), - constraints = { invokeOrder += " constraints";A("C") }()) + constraints = *arrayOf({ invokeOrder += " constraints";A("C") }())) if (result != "C, DEFAULT, I") return "fail 5: $result" if (invokeOrder != "init constraints default receiver") return "fail 6: $invokeOrder" diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt index e731abc2713..e697b79d5e6 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt @@ -26,7 +26,7 @@ fun box(): String { result = "" invokeOrder = "" - result = inlineFun(constraints = { invokeOrder += "constraints";A("C") }(), + result = inlineFun(constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()), receiver = { invokeOrder += " receiver"; "R" }(), init = { invokeOrder += " init"; "I" }()) if (result != "C, R, I") return "fail 1: $result" @@ -37,7 +37,7 @@ fun box(): String { result = "" invokeOrder = "" result = inlineFun(init = { invokeOrder += "init"; "I" }(), - constraints = { invokeOrder += "constraints";A("C") }(), + constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()), receiver = { invokeOrder += " receiver"; "R" }() ) if (result != "C, R, I") return "fail 3: $result" @@ -47,7 +47,7 @@ fun box(): String { result = "" invokeOrder = "" result = inlineFun(init = { invokeOrder += "init"; "I" }(), - constraints = { invokeOrder += " constraints";A("C") }()) + constraints = *arrayOf({ invokeOrder += " constraints";A("C") }())) if (result != "C, DEFAULT, I") return "fail 5: $result" if (invokeOrder != "init constraints default receiver") return "fail 6: $invokeOrder" diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineFunctionsWithMatchingJvmSignatures/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineFunctionsWithMatchingJvmSignatures/output.txt index 135b906b2a4..9ac07a0980f 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineFunctionsWithMatchingJvmSignatures/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineFunctionsWithMatchingJvmSignatures/output.txt @@ -7,5 +7,4 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: following manually enabled features will force generation of pre-release binaries: InlineClasses OK diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt index 137f43816f5..6956a81041f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt @@ -1,7 +1,7 @@ // KT-9051: Allow smart cast for captured variables if they are not modified fun foo(y: String) { - var x: String? = null + var x: String? = null y.let { x = it } x.length // Smart cast is not possible } diff --git a/compiler/testData/multiplatform/inlineClasses/output.txt b/compiler/testData/multiplatform/inlineClasses/output.txt index ea77928d764..de552cbb60c 100644 --- a/compiler/testData/multiplatform/inlineClasses/output.txt +++ b/compiler/testData/multiplatform/inlineClasses/output.txt @@ -1,6 +1,12 @@ -- Common -- Exit code: OK Output: +compiler/testData/multiplatform/inlineClasses/common.kt:3:8: warning: the feature "inline classes" is experimental +expect inline class Foo1(val x: Int) + ^ +compiler/testData/multiplatform/inlineClasses/common.kt:4:8: warning: the feature "inline classes" is experimental +expect inline class Foo2(val y: String) + ^ -- JVM -- Exit code: COMPILATION_ERROR