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

Require "-Xuse-experimental=kotlin.Experimental" on usages of Experimental

Browse Source 
Since we're not yet sure of the design of Experimental/UseExperimental,
we're making them "experimental" themselves in some sense, in that the
user is required to provide the magic argument
"-Xuse-experimental=kotlin.Experimental" to be allowed to use either
Experimental or UseExperimental. This is more convenient than the
previous approach of "-language-version 1.3
-Xskip-metadata-version-check" because it's simpler and does not cause
pre-release binaries to be produced
This commit is contained in:
Alexander Udalov
2018-04-27 14:11:57 +02:00
parent 2a61d42fc1
commit c57864e46c
41 changed files with 121 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/experimentalAndUseExperimentalWithSameAnnotation.args
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
$TESTDATA_DIR$/experimentalAndUseExperimentalWithSameAnnotation.kt
-d
$TEMP_DIR$
-Xskip-runtime-version-check
-language-version
1.3
-Xuse-experimental=kotlin.Experimental
-Xexperimental=org.test.ExperimentalAPI
-Xuse-experimental=org.test.ExperimentalAPI
compiler/testData/cli/jvm/experimentalAndUseExperimentalWithSameAnnotation.out
Vendored
-1
View File
@@ -1,3 +1,2 @@
warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features
error: '-Xuse-experimental=org.test.ExperimentalAPI' has no effect because '-Xexperimental=org.test.ExperimentalAPI' is used
COMPILATION_ERROR
compiler/testData/cli/jvm/experimentalDeprecated.args
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
$TESTDATA_DIR$/experimentalDeprecated.kt
-d
$TEMP_DIR$
-Xskip-runtime-version-check
-language-version
1.3
-Xuse-experimental=kotlin.Experimental
-Xexperimental=org.test.Error1
-Xexperimental=org.test.Hidden1
-Xuse-experimental=org.test.Error2
compiler/testData/cli/jvm/experimentalDeprecated.out
Vendored
-1
View File
@@ -1,4 +1,3 @@
warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features
error: experimental API marker org.test.Error1 is deprecated. Error1
error: experimental API marker org.test.Hidden1 is deprecated. Hidden1
error: experimental API marker org.test.Error2 is deprecated. Error2
compiler/testData/cli/jvm/experimentalDeprecatedWarning.args
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
$TESTDATA_DIR$/experimentalDeprecatedWarning.kt
-d
$TEMP_DIR$
-Xskip-runtime-version-check
-language-version
1.3
-Xuse-experimental=kotlin.Experimental
-Xuse-experimental=org.test.Warning1
-Xexperimental=org.test.Warning2
compiler/testData/cli/jvm/experimentalDeprecatedWarning.out
Vendored
-1
View File
@@ -1,4 +1,3 @@
warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features
warning: experimental API marker org.test.Warning2 is deprecated. Warning2
warning: experimental API marker org.test.Warning1 is deprecated. Warning1
OK
compiler/testData/cli/jvm/experimentalNested.args
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
$TESTDATA_DIR$/experimentalNested.kt
-d
$TEMP_DIR$
-Xskip-runtime-version-check
-language-version
1.3
-Xuse-experimental=kotlin.Experimental
-Xexperimental=org.test.Outer.Nested
compiler/testData/cli/jvm/experimentalNested.out
Vendored
-1
View File
@@ -1,2 +1 @@
warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features
OK
compiler/testData/diagnostics/testsWithStdLib/experimental/annotation.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/bodyUsages.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/classMembers.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/classMembersOverlyExperimental.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/constVal.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/deeplyNestedClass.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/errors.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalIsNotEnabled.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// FILE: api.kt
@<!EXPERIMENTAL_IS_NOT_ENABLED!>Experimental<!>
annotation class Marker
@Marker
fun f() {}
// FILE: usage.kt
fun use1() {
<!EXPERIMENTAL_API_USAGE_ERROR!>f<!>()
}
@Marker
fun use2() {
f()
}
@<!EXPERIMENTAL_IS_NOT_ENABLED!>UseExperimental<!>(Marker::class)
fun use3() {
f()
}
compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalIsNotEnabled.txt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package
@Marker public fun f(): kotlin.Unit
public fun use1(): kotlin.Unit
@Marker public fun use2(): kotlin.Unit
@kotlin.UseExperimental(markerClass = {Marker::class}) public fun use3(): kotlin.Unit
@kotlin.Experimental public final annotation class Marker : kotlin.Annotation {
public constructor Marker()
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
}
compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// !EXPERIMENTAL: api.ExperimentalAPI
// MODULE: api
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectUseExperimental.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
<!USE_EXPERIMENTAL_WITHOUT_ARGUMENTS!>@UseExperimental<!>
fun f1() {}
compiler/testData/diagnostics/testsWithStdLib/experimental/override.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/overrideDifferentExperimentalities.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
@Experimental(Experimental.Level.WARNING)
annotation class E1
compiler/testData/diagnostics/testsWithStdLib/experimental/scripts.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/topLevel.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/typealias.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnFile.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnFileWithVeryExperimentalMarker.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api
compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: api.ExperimentalAPI
// !USE_EXPERIMENTAL: kotlin.Experimental api.ExperimentalAPI
// MODULE: api
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalTargets.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: api.kt
compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalWithSeveralAnnotations.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !API_VERSION: 1.3
// !USE_EXPERIMENTAL: kotlin.Experimental
// FILE: api.kt
package api