Skip to content

Commit 29fcd20

Browse files
committed
Re-revert languge-version.md
1 parent 5c44e97 commit 29fcd20

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,10 @@ class CrossVersionChecks extends MiniPhase:
162162
tpe.foreachPart {
163163
case TypeRef(_, sym: Symbol) =>
164164
checkDeprecated(sym, tree.srcPos)
165-
<<<<<<< HEAD
166165
checkExperimentalRef(sym, tree.srcPos)
167-
checkSinceAnnot(sym, tree.srcPos)
168166
case TermRef(_, sym: Symbol) =>
169167
checkDeprecated(sym, tree.srcPos)
170168
checkExperimentalRef(sym, tree.srcPos)
171-
checkSinceAnnot(sym, tree.srcPos)
172-
=======
173-
checkExperimental(sym, tree.srcPos)
174-
case TermRef(_, sym: Symbol) =>
175-
checkDeprecated(sym, tree.srcPos)
176-
checkExperimental(sym, tree.srcPos)
177-
>>>>>>> d5b33c5f14 (Remove support for `-scala-output-version` flag)
178169
case _ =>
179170
}
180171
tree

docs/sidebar.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ subsection:
152152
- page: reference/experimental/cc.md
153153
- page: reference/experimental/tupled-function.md
154154
- page: reference/syntax.md
155+
- page: reference/language-versions.md
155156
- page: reference/soft-modifier.md
156157
- page: reference/features-classification.md
157158
- title: Contributing

library/src/scala/runtime/LazyVals.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.runtime
22

3-
import scala.annotation.since
4-
53
/**
64
* Helper methods used in thread-safe lazy vals.
75
*/
@@ -108,7 +106,6 @@ object LazyVals {
108106
r
109107
}
110108

111-
@since("3.2")
112109
def getOffsetStatic(field: java.lang.reflect.Field) =
113110
val r = unsafe.objectFieldOffset(field)
114111
if (debug)

project/resources/referenceReplacements/sidebar.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@ subsection:
148148
- page: reference/experimental/cc.md
149149
- page: reference/experimental/tupled-function.md
150150
- page: reference/syntax.md
151-
- title: Language Versions
152-
index: reference/language-versions/language-versions.md
153-
subsection:
154-
- page: reference/language-versions/source-compatibility.md
155-
- page: reference/language-versions/binary-compatibility.md
151+
- page: reference/language-versions.md
156152
- page: reference/soft-modifier.md
157153
- page: reference/features-classification.md

0 commit comments

Comments
 (0)