Skip to content

Commit 4eccd16

Browse files
committed
Re-revert languge-version.md
1 parent 5beaa0b commit 4eccd16

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
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
@@ -135,6 +135,7 @@ subsection:
135135
- page: reference/experimental/cc.md
136136
- page: reference/experimental/tupled-function.md
137137
- page: reference/syntax.md
138+
- page: reference/language-versions.md
138139
- page: reference/soft-modifier.md
139140
- page: reference/features-classification.md
140141
- title: Contributing

library/src/scala/runtime/LazyVals.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ object LazyVals {
108108
r
109109
}
110110

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

project/resources/referenceReplacements/sidebar.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ subsection:
130130
- page: reference/experimental/main-annotation.md
131131
- page: reference/experimental/cc.md
132132
- page: reference/syntax.md
133-
- title: Language Versions
134-
index: reference/language-versions/language-versions.md
135-
subsection:
136-
- page: reference/language-versions/source-compatibility.md
137-
- page: reference/language-versions/binary-compatibility.md
133+
- page: reference/language-versions.md
138134
- page: reference/soft-modifier.md
139135
- page: reference/features-classification.md

0 commit comments

Comments
 (0)