File tree 4 files changed +2
-15
lines changed
compiler/src/dotty/tools/dotc/typer
library/src/scala/runtime
project/resources/referenceReplacements
4 files changed +2
-15
lines changed Original file line number Diff line number Diff line change @@ -162,19 +162,10 @@ class CrossVersionChecks extends MiniPhase:
162
162
tpe.foreachPart {
163
163
case TypeRef (_, sym : Symbol ) =>
164
164
checkDeprecated(sym, tree.srcPos)
165
- <<<<<<< HEAD
166
165
checkExperimentalRef(sym, tree.srcPos)
167
- checkSinceAnnot(sym, tree.srcPos)
168
166
case TermRef (_, sym : Symbol ) =>
169
167
checkDeprecated(sym, tree.srcPos)
170
168
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)
178
169
case _ =>
179
170
}
180
171
tree
Original file line number Diff line number Diff line change @@ -135,6 +135,7 @@ subsection:
135
135
- page : reference/experimental/cc.md
136
136
- page : reference/experimental/tupled-function.md
137
137
- page : reference/syntax.md
138
+ - page : reference/language-versions.md
138
139
- page : reference/soft-modifier.md
139
140
- page : reference/features-classification.md
140
141
- title : Contributing
Original file line number Diff line number Diff line change @@ -108,7 +108,6 @@ object LazyVals {
108
108
r
109
109
}
110
110
111
- @ since(" 3.2" )
112
111
def getOffsetStatic (field : java.lang.reflect.Field ) =
113
112
val r = unsafe.objectFieldOffset(field)
114
113
if (debug)
Original file line number Diff line number Diff line change @@ -130,10 +130,6 @@ subsection:
130
130
- page : reference/experimental/main-annotation.md
131
131
- page : reference/experimental/cc.md
132
132
- 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
138
134
- page : reference/soft-modifier.md
139
135
- page : reference/features-classification.md
You can’t perform that action at this time.
0 commit comments