Skip to content

Commit 2e582a8

Browse files
AlexSikiaAlexSikia
committed
Clean up scalastyle on several files
1 parent 0e51cab commit 2e582a8

File tree

7 files changed

+30
-33
lines changed

7 files changed

+30
-33
lines changed

‎src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class Definitions {
326326
lazy val TransientAnnot = ctx.requiredClass("scala.transient")
327327
lazy val NativeAnnot = ctx.requiredClass("scala.native")
328328
lazy val ScalaStrictFPAnnot = ctx.requiredClass("scala.annotation.strictfp")
329-
lazy val specializedAnnot = ctx.requiredClass("scala.specialized")
329+
lazy val SpecializedAnnot = ctx.requiredClass("scala.specialized")
330330

331331
// Annotation classes
332332
lazy val AliasAnnot = ctx.requiredClass("dotty.annotation.internal.Alias")

‎src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,10 @@ object Symbols {
407407

408408
/** Subclass tests and casts */
409409
final def isTerm(implicit ctx: Context): Boolean =
410-
(if(isDefinedInCurrentRun) lastDenot else denot).isTerm
411-
410+
(if (isDefinedInCurrentRun) lastDenot else denot).isTerm
411+
412412
final def isType(implicit ctx: Context): Boolean =
413-
(if(isDefinedInCurrentRun) lastDenot else denot).isType
413+
(if (isDefinedInCurrentRun) lastDenot else denot).isType
414414

415415
final def isClass: Boolean = isInstanceOf[ClassSymbol]
416416

‎src/dotty/tools/dotc/transform/PreSpecializer.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class PreSpecializer extends MiniPhaseTransform {
2424
}
2525
else {
2626
val claz = companion.termSymbol.companionClass
27-
assert(ctx.definitions.ScalaValueClasses.contains(claz))
27+
assert(defn.ScalaValueClasses.contains(claz))
2828
claz.typeRef
2929
}
3030
}
@@ -49,12 +49,11 @@ class PreSpecializer extends MiniPhaseTransform {
4949
sym.name != nme.asInstanceOf_ &&
5050
sym.name != nme.isInstanceOf_ &&
5151
!(sym is Flags.JavaDefined) &&
52-
!sym.isConstructor &&
53-
!sym.name.toString.contains("Function2")
52+
!sym.isConstructor
5453
}
5554

5655
if (allowedToSpecialize(sym)) {
57-
val annotation = sym.denot.getAnnotation(ctx.definitions.specializedAnnot).getOrElse(Nil)
56+
val annotation = sym.denot.getAnnotation(defn.specializedAnnot).getOrElse(Nil)
5857
annotation match {
5958
case annot: Annotation =>
6059
val args = annot.arguments
@@ -84,4 +83,4 @@ class PreSpecializer extends MiniPhaseTransform {
8483
}
8584
tree
8685
}
87-
}
86+
}

‎src/dotty/tools/dotc/transform/TypeSpecializer.scala

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
4747

4848
private def defn(implicit ctx:Context) = ctx.definitions
4949

50-
private var specializationRequests: mutable.HashMap[Symbols.Symbol, List[Type]] = mutable.HashMap.empty
50+
private val specializationRequests: mutable.HashMap[Symbols.Symbol, List[Type]] = mutable.HashMap.empty
5151

5252
/**
5353
* A map that links symbols to their specialized variants.
@@ -61,15 +61,14 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
6161
sym.name != nme.asInstanceOf_ &&
6262
sym.name != nme.isInstanceOf_ &&
6363
!(sym is Flags.JavaDefined) &&
64-
!sym.isConstructor &&
65-
!sym.name.toString.contains("Function2")
64+
!sym.isConstructor
6665
}
6766

6867
def getSpecTypes(method: Symbol, poly: PolyType)(implicit ctx: Context): List[Type] = {
6968
val requested = specializationRequests.getOrElse(method, List.empty)
7069
if (requested.nonEmpty) requested
7170
else {
72-
if(ctx.settings.Yspecialize.value == "all") primitiveTypes.filter(tpe => poly.paramBounds.forall(_.contains(tpe)))
71+
if (ctx.settings.Yspecialize.value == "all") primitiveTypes.filter(tpe => poly.paramBounds.forall(_.contains(tpe)))
7372
else Nil
7473
}
7574
}
@@ -80,7 +79,7 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
8079
ctx.settings.Yspecialize.value == "all"
8180

8281
def registerSpecializationRequest(method: Symbols.Symbol)(arguments: List[Type])(implicit ctx: Context) = {
83-
if(ctx.phaseId > this.treeTransformPhase.id)
82+
if (ctx.phaseId > this.treeTransformPhase.id)
8483
assert(ctx.phaseId <= this.treeTransformPhase.id)
8584
val prev = specializationRequests.getOrElse(method, List.empty)
8685
specializationRequests.put(method, arguments ::: prev)
@@ -126,7 +125,7 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
126125
map.values.toList
127126
}
128127

129-
if((sym ne defn.ScalaPredefModule.moduleClass) &&
128+
if ((sym ne defn.ScalaPredefModule.moduleClass) &&
130129
!(sym is Flags.JavaDefined) &&
131130
!(sym is Flags.Scala2x) &&
132131
!(sym is Flags.Package) &&
@@ -204,9 +203,9 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
204203
t
205204
} else tpd.Apply(fun, newArgs)
206205
case t: ValDef =>
207-
cpy.ValDef(t)(rhs = if(t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
206+
cpy.ValDef(t)(rhs = if (t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
208207
case t: DefDef =>
209-
cpy.DefDef(t)(rhs = if(t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
208+
cpy.DefDef(t)(rhs = if (t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
210209
case t => t
211210
}}
212211
val expectedTypeFixed = tp.transform(typesReplaced)
@@ -278,4 +277,4 @@ class TypeSpecializer extends MiniPhaseTransform with InfoTransformer {
278277
} else tree
279278
} else tree
280279
}
281-
}
280+
}

‎test/dotc/tests.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,16 @@ class tests extends CompilerTest {
193193
val javaDir = "./tests/pos/java-interop/"
194194
@Test def java_all = compileFiles(javaDir, twice)
195195

196-
@Test def simple_specialization = compileFile(specialDir, "simple_specialization", List("-Xprint:specialize"))
197-
@Test def mutual_spec = compileFile(specialDir, "mutual_specialization", List("-Xprint:specialize"))
198-
@Test def return_spec = compileFile(specialDir, "return_specialization", List("-Xprint:specialize"))
199-
@Test def nothing_spec = compileFile(specialDir, "nothing_specialization", List("-Xprint:specialize"))
200-
@Test def method_in_class_spec = compileFile(specialDir, "method_in_class_specialization", List("-Xprint:specialize"))
201-
@Test def method_in_method_spec = compileFile(specialDir, "method_in_method_specialization", List("-Xprint:specialize"))
202-
@Test def pos_type_check = compileFile(specialDir, "type_test", List("-Xprint:specialize"))
203-
@Test def bounds_spec = compileFile(specialDir, "bounds_specialization", List("-Xprint:specialize"))
204-
@Test def multi_spec = compileFile(specialDir, "multi_specialization", List("-Xprint:specialize"))
205-
@Test def pos_this_specialization = compileFile(specialDir, "this_specialization", List("-Xprint:specialize"))
196+
@Test def simple_specialization = compileFile(specialDir, "simple_specialization")
197+
@Test def mutual_spec = compileFile(specialDir, "mutual_specialization")
198+
@Test def return_spec = compileFile(specialDir, "return_specialization")
199+
@Test def nothing_spec = compileFile(specialDir, "nothing_specialization")
200+
@Test def method_in_class_spec = compileFile(specialDir, "method_in_class_specialization")
201+
@Test def method_in_method_spec = compileFile(specialDir, "method_in_method_specialization")
202+
@Test def pos_type_check = compileFile(specialDir, "type_test")
203+
@Test def bounds_spec = compileFile(specialDir, "bounds_specialization")
204+
@Test def multi_spec = compileFile(specialDir, "multi_specialization")
205+
@Test def pos_this_specialization = compileFile(specialDir, "this_specialization")
206206
@Test def pos_spec_all = compileFiles(specialDir)
207207

208208
@Test def run_spec = runFile(runDir, "method-specialization")

‎tests/pos/specialization/bounds_specialization.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object bounds_specialization {
2-
/*class Foo[@specialized K] {
3-
def bar[@specialized U](u: U) {
4-
def dough[@specialized V](v: V) {
2+
class Foo[@specialized K] {
3+
def bar[@specialized U](u: U) = {
4+
def dough[@specialized V](v: V) = {
55
println("innerMethod")
66
}
77
dough(1.toShort)
@@ -10,7 +10,7 @@ object bounds_specialization {
1010
bar(2.toShort)
1111
bar('d')
1212
}
13-
*/
13+
1414
def kung[@specialized(Int, Double) T <: AnyRef](t: T): T = {
1515
t
1616
}

‎tests/pos/specialization/nothing_specialization.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
object nothing_specialization {
22
def ret_nothing[@specialized(Char) T] = {
3-
//val a: List[T] = List[Nothing]()
43
def apply[@specialized(Char) X](xs : X*) : List[X] = List(xs:_*)
54
def apply6[@specialized(Char) X](xs : Nothing*) : List[Nothing] = List(xs: _*)
65
def apply2[@specialized(Long) U] = 1.asInstanceOf[U]

0 commit comments

Comments
 (0)