From ece9915d359c9aa8927605391b4b3d244311dfbd Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 17 Oct 2017 10:31:36 +0200 Subject: [PATCH] Remove Scope.filter(...).toList --- .../src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 4 ++-- compiler/src/dotty/tools/dotc/core/SymDenotations.scala | 2 +- compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala | 2 +- compiler/src/dotty/tools/dotc/transform/Mixin.scala | 2 +- compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala | 2 +- compiler/src/dotty/tools/dotc/transform/SymUtils.scala | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index c6fc78139190..49600c6d9b90 100644 --- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -707,7 +707,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma private def definedClasses(phase: Phase) = if (sym.isDefinedInCurrentRun) ctx.atPhase(phase) { implicit ctx => - toDenot(sym).info.decls.filter(_.isClass).toList + toDenot(sym).info.decls.filter(_.isClass) } else Nil @@ -719,7 +719,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma else Nil } def fieldSymbols: List[Symbol] = { - toDenot(sym).info.decls.filter(p => p.isTerm && !p.is(Flags.Method)).toList + toDenot(sym).info.decls.filter(p => p.isTerm && !p.is(Flags.Method)) } def methodSymbols: List[Symbol] = for (f <- toDenot(sym).info.decls.toList if f.isMethod && f.isTerm && !f.isModule) yield f diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index df22daaf9e89..2c3d2f9259a4 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1753,7 +1753,7 @@ object SymDenotations { * Both getters and setters are returned in this list. */ def paramAccessors(implicit ctx: Context): List[Symbol] = - unforcedDecls.filter(_.is(ParamAccessor)).toList + unforcedDecls.filter(_.is(ParamAccessor)) /** If this class has the same `decls` scope reference in `phase` and * `phase.next`, install a new denotation with a cloned scope in `phase.next`. diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 6b24d4108c2e..a8c3667d8992 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -215,7 +215,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder // and can therefore be ignored. def alwaysPresent(s: Symbol) = s.isCompanionMethod || (csym.is(ModuleClass) && s.isConstructor) - val decls = cinfo.decls.filter(!alwaysPresent(_)).toList + val decls = cinfo.decls.filter(!alwaysPresent(_)) val apiDecls = apiDefinitions(decls) val declSet = decls.toSet diff --git a/compiler/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala index 48037e89a29c..fc6cc67eba18 100644 --- a/compiler/src/dotty/tools/dotc/transform/Mixin.scala +++ b/compiler/src/dotty/tools/dotc/transform/Mixin.scala @@ -240,7 +240,7 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform => } def setters(mixin: ClassSymbol): List[Tree] = - for (setter <- mixin.info.decls.filter(setr => setr.isSetter && !was(setr, Deferred)).toList) + for (setter <- mixin.info.decls.filter(setr => setr.isSetter && !was(setr, Deferred))) yield transformFollowing(DefDef(implementation(setter.asTerm), unitLiteral.withPos(cls.pos))) cpy.Template(impl)( diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index d8e2414d19c8..03a8f9678085 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -61,7 +61,7 @@ class ResolveSuper extends MiniPhaseTransform with IdentityDenotTransformer { th import ops._ def superAccessors(mixin: ClassSymbol): List[Tree] = - for (superAcc <- mixin.info.decls.filter(_.isSuperAccessor).toList) + for (superAcc <- mixin.info.decls.filter(_.isSuperAccessor)) yield { util.Stats.record("super accessors") polyDefDef(implementation(superAcc.asTerm), forwarder(rebindSuper(cls, superAcc))) diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala index 762aed8c7a82..776ecb057892 100644 --- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala @@ -89,10 +89,10 @@ class SymUtils(val self: Symbol) extends AnyVal { self.owner.info.decl(name).suchThat(_ is Accessor).symbol def paramAccessors(implicit ctx: Context): List[Symbol] = - self.info.decls.filter(_ is ParamAccessor).toList + self.info.decls.filter(_ is ParamAccessor) - def caseAccessors(implicit ctx:Context) = - self.info.decls.filter(_ is CaseAccessor).toList + def caseAccessors(implicit ctx: Context): List[Symbol] = + self.info.decls.filter(_ is CaseAccessor) def getter(implicit ctx: Context): Symbol = if (self.isGetter) self else accessorNamed(self.asTerm.name.getterName)