Re-revert languge-version.md

scala · May 17, 2022 · 0a900f1 · 0a900f1
1 parent 5beaa0b
commit 0a900f1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
@@ -162,19 +162,10 @@ class CrossVersionChecks extends MiniPhase:
     tpe.foreachPart {
       case TypeRef(_, sym: Symbol)  =>
         checkDeprecated(sym, tree.srcPos)
-<<<<<<< HEAD
         checkExperimentalRef(sym, tree.srcPos)
-        checkSinceAnnot(sym, tree.srcPos)
       case TermRef(_, sym: Symbol)  =>
         checkDeprecated(sym, tree.srcPos)
         checkExperimentalRef(sym, tree.srcPos)
-        checkSinceAnnot(sym, tree.srcPos)
-=======
-        checkExperimental(sym, tree.srcPos)
-      case TermRef(_, sym: Symbol)  =>
-        checkDeprecated(sym, tree.srcPos)
-        checkExperimental(sym, tree.srcPos)
->>>>>>> d5b33c5f14 (Remove support for `-scala-output-version` flag)
       case _ =>
     }
     tree

diff --git a/docs/sidebar.yml b/docs/sidebar.yml
@@ -135,6 +135,7 @@ subsection:
           - page: reference/experimental/cc.md
           - page: reference/experimental/tupled-function.md
       - page: reference/syntax.md
+      - page: reference/language-versions.md
       - page: reference/soft-modifier.md
       - page: reference/features-classification.md
   - title: Contributing

diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala
@@ -1,7 +1,5 @@
 package scala.runtime
 
-import scala.annotation.since
-
 /**
  * Helper methods used in thread-safe lazy vals.
  */
@@ -108,7 +106,6 @@ object LazyVals {
     r
   }
 
-  @since("3.2")
   def getOffsetStatic(field: java.lang.reflect.Field) =
     val r = unsafe.objectFieldOffset(field)
     if (debug)

diff --git a/project/resources/referenceReplacements/sidebar.yml b/project/resources/referenceReplacements/sidebar.yml
@@ -130,10 +130,6 @@ subsection:
       - page: reference/experimental/main-annotation.md
       - page: reference/experimental/cc.md
   - page: reference/syntax.md
-  - title: Language Versions
-    index: reference/language-versions/language-versions.md
-    subsection:
-      - page: reference/language-versions/source-compatibility.md
-      - page: reference/language-versions/binary-compatibility.md
+  - page: reference/language-versions.md
   - page: reference/soft-modifier.md
   - page: reference/features-classification.md