Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[nomaster] Revert "more ListOfNil => Nil"

This reverts commit bb9adfb.
  • Loading branch information...
commit 4d7982b592fc2d4f75eb56b4a810c5d002d25866 1 parent 4ef2a49
@xeno-by xeno-by authored
View
2  src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -58,7 +58,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
def mkUnchecked(expr: Tree): Tree = atPos(expr.pos) {
// This can't be "Annotated(New(UncheckedClass), expr)" because annotations
// are very picky about things and it crashes the compiler with "unexpected new".
- Annotated(New(scalaDot(UncheckedClass.name), Nil), expr)
+ Annotated(New(scalaDot(UncheckedClass.name), ListOfNil), expr)
}
// if it's a Match, mark the selector unchecked; otherwise nothing.
def mkUncheckedMatch(tree: Tree) = tree match {
View
2  src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2103,7 +2103,7 @@ self =>
def annotationExpr(): Tree = atPos(in.offset) {
val t = exprSimpleType()
if (in.token == LPAREN) New(t, multipleArgumentExprs())
- else New(t, Nil)
+ else New(t, ListOfNil)
}
/* -------- PARAMETERS ------------------------------------------- */
View
2  src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -237,7 +237,7 @@ abstract class TreeBuilder {
atPos(npos) {
New(
Ident(x) setPos npos.focus,
- Nil)
+ ListOfNil)
}
)
}
View
2  src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -551,7 +551,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
if (parentToken == AT && in.token == DEFAULT) {
val annot =
atPos(pos) {
- New(Select(scalaDot(nme.runtime), tpnme.AnnotationDefaultATTR), Nil)
+ New(Select(scalaDot(nme.runtime), tpnme.AnnotationDefaultATTR), ListOfNil)
}
mods1 = mods1 withAnnotations List(annot)
skipTo(SEMI)

1 comment on commit 4d7982b

@scala-jenkins

Job pr-rangepos-per-commit failed for 4d7982b (results):


Took 8 s.
sad kitty
to rebuild, comment "PLS REBUILD/pr-rangepos-per-commit@4d7982b"on PR #2112

Please sign in to comment.
Something went wrong with that request. Please try again.