From cf73f182c7ddbc37a3932b2582ee075cebd5fe2a Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Tue, 30 Mar 2021 10:18:49 +0200 Subject: [PATCH] Minor. Change warning message --- .../kotlin/diagnostics/rendering/DefaultErrorMessages.java | 2 +- .../testData/cli/jvm/internalArgOverrideLanguageFeature.out | 2 +- .../cli/jvm/internalArgOverrideOffLanguageFeature.out | 2 +- compiler/testData/multiplatform/inlineClasses/output.txt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 2978c043e47..16400125bba 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -723,7 +723,7 @@ public class DefaultErrorMessages { MAP.put(SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_INLINE_CLASS, "Secondary constructors with bodies are reserved for for future releases"); MAP.put(INNER_CLASS_INSIDE_INLINE_CLASS, "Inline class cannot have inner classes"); MAP.put(VALUE_CLASS_CANNOT_BE_CLONEABLE, "Value class cannot be Cloneable"); - MAP.put(INLINE_CLASS_DEPRECATED, "Inline classes are deprecated in favor of value classes"); + MAP.put(INLINE_CLASS_DEPRECATED, "'inline' modifier is deprecated. Use 'value' instead"); MAP.put(RESULT_CLASS_IN_RETURN_TYPE, "'kotlin.Result' cannot be used as a return type"); MAP.put(RESULT_CLASS_WITH_NULLABLE_OPERATOR, "Expression of type 'kotlin.Result' cannot be used as a left operand of ''{0}''", STRING); diff --git a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out index b46dd196f07..2e9ccc07676 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out @@ -7,7 +7,7 @@ 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! -compiler/testData/cli/jvm/inlineClass.kt:1:1: warning: inline classes are deprecated in favor of value classes +compiler/testData/cli/jvm/inlineClass.kt:1:1: warning: 'inline' modifier is deprecated. Use 'value' instead inline class Foo(val x: Int) ^ OK diff --git a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out index f5ad523eb02..c4a3a015d8e 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out @@ -7,7 +7,7 @@ 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! -compiler/testData/cli/jvm/inlineClass.kt:1:1: warning: inline classes are deprecated in favor of value classes +compiler/testData/cli/jvm/inlineClass.kt:1:1: warning: 'inline' modifier is deprecated. Use 'value' instead inline class Foo(val x: Int) ^ OK diff --git a/compiler/testData/multiplatform/inlineClasses/output.txt b/compiler/testData/multiplatform/inlineClasses/output.txt index 2d46af487b2..1a5a46f7089 100644 --- a/compiler/testData/multiplatform/inlineClasses/output.txt +++ b/compiler/testData/multiplatform/inlineClasses/output.txt @@ -1,10 +1,10 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/inlineClasses/common.kt:3:8: warning: inline classes are deprecated in favor of value classes +compiler/testData/multiplatform/inlineClasses/common.kt:3:8: warning: 'inline' modifier is deprecated. Use 'value' instead expect inline class Foo1(val x: Int) ^ -compiler/testData/multiplatform/inlineClasses/common.kt:4:8: warning: inline classes are deprecated in favor of value classes +compiler/testData/multiplatform/inlineClasses/common.kt:4:8: warning: 'inline' modifier is deprecated. Use 'value' instead expect inline class Foo2(val y: String) ^