From 74ffca5b102553f990b233a53445f6368205a184 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 5 Nov 2009 07:03:24 +0000 Subject: simplified re-ordering packages --- src/compiler/scala/tools/nsc/Global.scala | 11 ++--------- src/library/scala/Array.scala | 3 +-- src/library/scala/LowPriorityImplicits.scala | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 191016e133..bae0d624c6 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -928,19 +928,12 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable f.file.container.name == "scala" val res = new ListBuffer[SourceFile] var scalaObject: Option[SourceFile] = None - var lowPriorityImplicits: Option[SourceFile] = None - var predef: Option[SourceFile] = None for (file <- files) file.file.name match { - case "ScalaObject.scala" if inScalaFolder(file) => scalaObject = Some(file) - case "LowPriorityImplicits.scala" if inScalaFolder(file) => lowPriorityImplicits = Some(file) - case "Predef.scala" if inScalaFolder(file) => predef = Some(file) + case "ScalaObject.scala" if inScalaFolder(file) => scalaObject = Some(file) case "package.scala" => file +=: res // prepend package objects case _ => res += file // append all others } - val f: SourceFile => Unit = res.+=:(_) - predef map f // Predef 3rd - lowPriorityImplicits map f // LowPriorityImplicits 2nd - scalaObject map f // ScalaObject 1st + scalaObject.map(res.+=:(_)) // ScalaObject 1st res.toList // then package objects, then others } } // class Run diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index dcc64135c4..a323dccffc 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -12,8 +12,7 @@ package scala import scala.collection.generic._ -import scala.collection.Traversable -import scala.collection.mutable.{IndexedSeq, ArrayBuilder, GenericArray} +import scala.collection.mutable.{ArrayBuilder, GenericArray} import compat.Platform.arraycopy import scala.reflect.ClassManifest import scala.runtime.ScalaRunTime.{array_apply, array_update} diff --git a/src/library/scala/LowPriorityImplicits.scala b/src/library/scala/LowPriorityImplicits.scala index acfb8b3ceb..64247023fd 100644 --- a/src/library/scala/LowPriorityImplicits.scala +++ b/src/library/scala/LowPriorityImplicits.scala @@ -12,7 +12,7 @@ package scala import collection.mutable._ -import collection.immutable.{WrappedString, IndexedSeq} +import collection.immutable.WrappedString import collection.generic.CanBuildFrom /** The `LowPriorityImplicits` class provides implicit values that -- cgit v1.2.3