From 19aea71a68e74857e8a269f7661ea33932b66562 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 26 Aug 2021 11:18:20 +0200 Subject: [PATCH 1/2] Bumb TASTy minor version Preparing for 3.1 Closes #13385 --- tasty/src/dotty/tools/tasty/TastyFormat.scala | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala index 14cf985775b3..33858d5572ea 100644 --- a/tasty/src/dotty/tools/tasty/TastyFormat.scala +++ b/tasty/src/dotty/tools/tasty/TastyFormat.scala @@ -272,34 +272,34 @@ object TastyFormat { */ final val header: Array[Int] = Array(0x5C, 0xA1, 0xAB, 0x1F) - /**Natural number. Each increment of the `MajorVersion` begins a - * new series of backward compatible TASTy versions. + /** Natural number. Each increment of the `MajorVersion` begins a + * new series of backward compatible TASTy versions. * - * A TASTy file in either the preceeding or succeeding series is - * incompatible with the current value. + * A TASTy file in either the preceeding or succeeding series is + * incompatible with the current value. */ final val MajorVersion: Int = 28 - /**Natural number. Each increment of the `MinorVersion`, within - * a series declared by the `MajorVersion`, breaks forward - * compatibility, but remains backwards compatible, with all - * preceeding `MinorVersion`. + /** Natural number. Each increment of the `MinorVersion`, within + * a series declared by the `MajorVersion`, breaks forward + * compatibility, but remains backwards compatible, with all + * preceeding `MinorVersion`. */ - final val MinorVersion: Int = 1 + final val MinorVersion: Int = 2 - /**Natural Number. The `ExperimentalVersion` allows for - * experimentation with changes to TASTy without committing - * to any guarantees of compatibility. + /** Natural Number. The `ExperimentalVersion` allows for + * experimentation with changes to TASTy without committing + * to any guarantees of compatibility. * - * A zero value indicates that the TASTy version is from a - * stable, final release. + * A zero value indicates that the TASTy version is from a + * stable, final release. * - * A strictly positive value indicates that the TASTy - * version is experimental. An experimental TASTy file - * can only be read by a tool with the same version. - * However, tooling with an experimental TASTy version - * is able to read final TASTy documents if the file's - * `MinorVersion` is strictly less than the current value. + * A strictly positive value indicates that the TASTy + * version is experimental. An experimental TASTy file + * can only be read by a tool with the same version. + * However, tooling with an experimental TASTy version + * is able to read final TASTy documents if the file's + * `MinorVersion` is strictly less than the current value. */ final val ExperimentalVersion: Int = 1 From 052ca4c62a81e4b090af4087b31267f586d2ff15 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 26 Aug 2021 14:12:37 +0200 Subject: [PATCH 2/2] Remove @experimental library test --- .../scala/annotation/internal/experimentalTest.scala | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 library/src-non-bootstrapped/scala/annotation/internal/experimentalTest.scala diff --git a/library/src-non-bootstrapped/scala/annotation/internal/experimentalTest.scala b/library/src-non-bootstrapped/scala/annotation/internal/experimentalTest.scala deleted file mode 100644 index 67f672b02c78..000000000000 --- a/library/src-non-bootstrapped/scala/annotation/internal/experimentalTest.scala +++ /dev/null @@ -1,12 +0,0 @@ -// KEEP IN NON-BOOTSTRAPPED SOURCES -package scala.annotation -package internal - -/** This is a dummy definition that tests that the stdlib can be compiled with an experimental definition. - * This might be redundant, we keep it definition in case there are no other @experimental definitions in the library. - * As this definition is in `src-non-bootstrapped`, it will not be published. - * It may accidentally be visible while compiling the non-bootstrapped library. - */ -@experimental def testExperimental = 4 - -// def test = testExperimental // This should fail if un-commented