azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI: remove obsolete -Xallow-result-return-type

Browse Source
This commit is contained in:
Alexander Udalov
2023-10-24 12:17:02 +02:00
committed by Space Team
parent 49c659b379
commit 9d5e1bdc47
16 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
+1 -2
View File
@@ -10,8 +10,8 @@ import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
import org.jetbrains.kotlin.test.services.DefaultsDsl
import org.jetbrains.kotlin.test.services.AbstractEnvironmentConfigurator
import org.jetbrains.kotlin.test.services.DefaultsDsl
import org.jetbrains.kotlin.test.util.LANGUAGE_FEATURE_PATTERN
import org.jetbrains.kotlin.utils.addToStdlib.runIf
@@ -100,7 +100,6 @@ class LanguageVersionSettingsBuilder {
val analysisFlags = listOfNotNull(
analysisFlag(AnalysisFlags.optIn, directives[LanguageSettingsDirectives.OPT_IN].takeIf { it.isNotEmpty() }),
analysisFlag(AnalysisFlags.ignoreDataFlowInAssert, trueOrNull(LanguageSettingsDirectives.IGNORE_DATA_FLOW_IN_ASSERT in directives)),
analysisFlag(AnalysisFlags.allowResultReturnType, trueOrNull(LanguageSettingsDirectives.ALLOW_RESULT_RETURN_TYPE in directives)),
analysisFlag(AnalysisFlags.explicitApiMode, directives.singleOrZeroValue(LanguageSettingsDirectives.EXPLICIT_API_MODE)),
analysisFlag(AnalysisFlags.allowKotlinPackage, trueOrNull(LanguageSettingsDirectives.ALLOW_KOTLIN_PACKAGE in directives)),
analysisFlag(AnalysisFlags.muteExpectActualClassesWarning, trueOrNull(LanguageSettingsDirectives.ENABLE_EXPECT_ACTUAL_CLASSES_WARNING in directives) != true),
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt
+4 -5
View File
@@ -5,7 +5,10 @@
package org.jetbrains.kotlin.test.directives
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.ExplicitApiMode
import org.jetbrains.kotlin.config.JvmDefaultMode
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
object LanguageSettingsDirectives : SimpleDirectivesContainer() {
@@ -51,10 +54,6 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() {
description = "Enables corresponding analysis flag (AnalysisFlags.ignoreDataFlowInAssert)"
)
val ALLOW_RESULT_RETURN_TYPE by directive(
description = "Allow using Result in return type position"
)
val EXPLICIT_API_MODE by enumDirective(
"Configures explicit API mode (AnalysisFlags.explicitApiMode)",
additionalParser = ExplicitApiMode.Companion::fromString