From 8fb4e9ecc76efcfc71d485ad78c9f474d1a89175 Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sat, 10 Nov 2012 11:03:30 -0700
Subject: Removed unused imports in swing.
---
src/swing/scala/swing/Button.scala | 3 ---
src/swing/scala/swing/ButtonGroup.scala | 4 +---
src/swing/scala/swing/EditorPane.scala | 3 ---
src/swing/scala/swing/FormattedTextField.scala | 4 ----
src/swing/scala/swing/MainFrame.scala | 4 ----
src/swing/scala/swing/PasswordField.scala | 4 ----
src/swing/scala/swing/ProgressBar.scala | 4 ----
src/swing/scala/swing/Reactions.scala | 2 --
src/swing/scala/swing/SplitPane.scala | 3 ---
src/swing/scala/swing/SwingActor.scala | 4 ----
src/swing/scala/swing/TextArea.scala | 4 ----
src/swing/scala/swing/TextComponent.scala | 3 ---
src/swing/scala/swing/ToggleButton.scala | 3 ---
src/swing/scala/swing/Window.scala | 3 ---
14 files changed, 1 insertion(+), 47 deletions(-)
(limited to 'src')
diff --git a/src/swing/scala/swing/Button.scala b/src/swing/scala/swing/Button.scala
index f10d49d804..0170727e3b 100644
--- a/src/swing/scala/swing/Button.scala
+++ b/src/swing/scala/swing/Button.scala
@@ -6,11 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import javax.swing._
object Button {
diff --git a/src/swing/scala/swing/ButtonGroup.scala b/src/swing/scala/swing/ButtonGroup.scala
index 2075df7c92..0b04d20837 100644
--- a/src/swing/scala/swing/ButtonGroup.scala
+++ b/src/swing/scala/swing/ButtonGroup.scala
@@ -8,9 +8,7 @@
package scala.swing
-import event._
-import javax.swing.{AbstractButton => JAbstractButton,Icon}
-import scala.collection.{ mutable, immutable }
+import scala.collection.mutable
/**
* A button mutex. At most one of its associated buttons is selected
diff --git a/src/swing/scala/swing/EditorPane.scala b/src/swing/scala/swing/EditorPane.scala
index b8c506daf0..9b1aab7874 100644
--- a/src/swing/scala/swing/EditorPane.scala
+++ b/src/swing/scala/swing/EditorPane.scala
@@ -6,13 +6,10 @@
** |/ **
\* */
-
package scala.swing
-import event._
import javax.swing._
import javax.swing.text._
-import java.awt.event._
/**
* A text component that allows multiline text input and display.
diff --git a/src/swing/scala/swing/FormattedTextField.scala b/src/swing/scala/swing/FormattedTextField.scala
index 311ff42d0a..b08075850c 100644
--- a/src/swing/scala/swing/FormattedTextField.scala
+++ b/src/swing/scala/swing/FormattedTextField.scala
@@ -6,13 +6,9 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import javax.swing._
-import java.awt.event._
object FormattedTextField {
/**
diff --git a/src/swing/scala/swing/MainFrame.scala b/src/swing/scala/swing/MainFrame.scala
index 85ce0755ac..1dfc155f9c 100644
--- a/src/swing/scala/swing/MainFrame.scala
+++ b/src/swing/scala/swing/MainFrame.scala
@@ -6,12 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
-
/**
* A frame that can be used for main application windows. Shuts down the
* framework and quits the application when closed.
diff --git a/src/swing/scala/swing/PasswordField.scala b/src/swing/scala/swing/PasswordField.scala
index d2fdd0d38a..fd0b586a0f 100644
--- a/src/swing/scala/swing/PasswordField.scala
+++ b/src/swing/scala/swing/PasswordField.scala
@@ -6,13 +6,9 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import javax.swing._
-import java.awt.event._
/**
* A password field, that displays a replacement character for each character in the password.
diff --git a/src/swing/scala/swing/ProgressBar.scala b/src/swing/scala/swing/ProgressBar.scala
index 33dd716524..81e2989c3e 100644
--- a/src/swing/scala/swing/ProgressBar.scala
+++ b/src/swing/scala/swing/ProgressBar.scala
@@ -6,12 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
-
/**
* A bar indicating progress of some action. Can be in indeterminate mode,
* in which it indicates that the action is in progress (usually by some
diff --git a/src/swing/scala/swing/Reactions.scala b/src/swing/scala/swing/Reactions.scala
index d8a62aa99d..c32212cf3a 100644
--- a/src/swing/scala/swing/Reactions.scala
+++ b/src/swing/scala/swing/Reactions.scala
@@ -14,8 +14,6 @@ import event.Event
import scala.collection.mutable.{Buffer, ListBuffer}
object Reactions {
- import scala.ref._
-
class Impl extends Reactions {
private val parts: Buffer[Reaction] = new ListBuffer[Reaction]
def isDefinedAt(e: Event) = parts.exists(_ isDefinedAt e)
diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala
index dd4f2908d5..f61dfedbf4 100644
--- a/src/swing/scala/swing/SplitPane.scala
+++ b/src/swing/scala/swing/SplitPane.scala
@@ -6,11 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import Swing._
/**
diff --git a/src/swing/scala/swing/SwingActor.scala b/src/swing/scala/swing/SwingActor.scala
index 6692180aac..c665fa4c00 100644
--- a/src/swing/scala/swing/SwingActor.scala
+++ b/src/swing/scala/swing/SwingActor.scala
@@ -6,12 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import scala.actors._
-
// Dummy to keep ant from recompiling on every run.
trait SwingActor { }
diff --git a/src/swing/scala/swing/TextArea.scala b/src/swing/scala/swing/TextArea.scala
index 01bf115d28..2f6bdca119 100644
--- a/src/swing/scala/swing/TextArea.scala
+++ b/src/swing/scala/swing/TextArea.scala
@@ -6,13 +6,9 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import javax.swing._
-import java.awt.event._
/**
* A text component that allows multiline text input and display.
diff --git a/src/swing/scala/swing/TextComponent.scala b/src/swing/scala/swing/TextComponent.scala
index 48c03a5f54..4d23399737 100644
--- a/src/swing/scala/swing/TextComponent.scala
+++ b/src/swing/scala/swing/TextComponent.scala
@@ -6,12 +6,9 @@
** |/ **
\* */
-
-
package scala.swing
import event._
-import javax.swing._
import javax.swing.text._
import javax.swing.event._
diff --git a/src/swing/scala/swing/ToggleButton.scala b/src/swing/scala/swing/ToggleButton.scala
index 3d3d0b957f..8f210d00d8 100644
--- a/src/swing/scala/swing/ToggleButton.scala
+++ b/src/swing/scala/swing/ToggleButton.scala
@@ -6,11 +6,8 @@
** |/ **
\* */
-
-
package scala.swing
-import event._
import javax.swing._
/**
diff --git a/src/swing/scala/swing/Window.scala b/src/swing/scala/swing/Window.scala
index 5bdb50e959..a9f4ae7538 100644
--- a/src/swing/scala/swing/Window.scala
+++ b/src/swing/scala/swing/Window.scala
@@ -6,13 +6,10 @@
** |/ **
\* */
-
-
package scala.swing
import java.awt.{Window => AWTWindow}
import event._
-import javax.swing._
/**
* A window with decoration such as a title, border, and action buttons.
--
cgit v1.2.3
From 66d3540769628fb08c3946c98fee2b5a3fe176ce Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sat, 10 Nov 2012 11:07:24 -0700
Subject: Remove unused imports in partest.
---
src/partest/scala/tools/partest/ScaladocModelTest.scala | 4 +---
src/partest/scala/tools/partest/nest/ConsoleFileManager.scala | 2 --
src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 1 -
src/partest/scala/tools/partest/nest/DirectRunner.scala | 1 -
src/partest/scala/tools/partest/nest/FileManager.scala | 1 -
src/partest/scala/tools/partest/nest/PathSettings.scala | 1 -
6 files changed, 1 insertion(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/partest/scala/tools/partest/ScaladocModelTest.scala b/src/partest/scala/tools/partest/ScaladocModelTest.scala
index e7134d0271..acaddff944 100644
--- a/src/partest/scala/tools/partest/ScaladocModelTest.scala
+++ b/src/partest/scala/tools/partest/ScaladocModelTest.scala
@@ -5,8 +5,6 @@
package scala.tools.partest
-import scala.tools.partest._
-import java.io._
import scala.tools.nsc._
import scala.tools.nsc.util.CommandLineParser
import scala.tools.nsc.doc.{Settings, DocFactory, Universe}
@@ -87,7 +85,7 @@ abstract class ScaladocModelTest extends DirectTest {
settings = new Settings(_ => ())
settings.scaladocQuietRun = true // yaay, no more "model contains X documentable templates"!
val args = extraSettings + " " + scaladocSettings
- val command = new ScalaDoc.Command((CommandLineParser tokenize (args)), settings)
+ new ScalaDoc.Command((CommandLineParser tokenize (args)), settings) // side-effecting, I think
val docFact = new DocFactory(new ConsoleReporter(settings), settings)
docFact
}
diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
index 891830b509..75aed449a8 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
@@ -18,8 +18,6 @@ import io.{ Path, Directory }
import File.pathSeparator
import ClassPath.{ join }
import PathResolver.{ Environment, Defaults }
-import RunnerUtils._
-
class ConsoleFileManager extends FileManager {
var testBuild: Option[String] = PartestDefaults.testBuild
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
index 308124e250..d23ee81e4d 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
@@ -11,7 +11,6 @@ package nest
import java.io.{File, PrintStream, FileOutputStream, BufferedReader,
InputStreamReader, StringWriter, PrintWriter}
import utils.Properties._
-import RunnerUtils._
import scala.tools.nsc.Properties.{ versionMsg, setProp }
import scala.tools.nsc.util.CommandLineParser
import scala.tools.nsc.io
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index 32ef8b41ea..3aaf784cad 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -14,7 +14,6 @@ import scala.tools.nsc.util.ScalaClassLoader
import scala.tools.nsc.io.Path
import scala.collection.{ mutable, immutable }
import java.util.concurrent._
-import scala.collection.convert.decorateAll._
case class TestRunParams(val scalaCheckParentClassLoader: ScalaClassLoader)
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 2823967ecf..21fd314552 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -13,7 +13,6 @@ import java.io.{File, FilenameFilter, IOException, StringWriter,
FileReader, PrintWriter, FileWriter}
import java.net.URI
import scala.tools.nsc.io.{ Path, Directory, File => SFile }
-import scala.sys.process._
import scala.collection.mutable
trait FileUtil {
diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala
index a42c2219b1..02651c527b 100644
--- a/src/partest/scala/tools/partest/nest/PathSettings.scala
+++ b/src/partest/scala/tools/partest/nest/PathSettings.scala
@@ -9,7 +9,6 @@ import scala.tools.nsc.Properties.{ setProp, propOrEmpty, propOrNone, propOrElse
import scala.tools.nsc.util.ClassPath
import scala.tools.nsc.io
import io.{ Path, File, Directory }
-import RunnerUtils._
object PathSettings {
import PartestDefaults.{ testRootDir, srcDirName }
--
cgit v1.2.3
From c4395b373c259be98ea06b156499569d985c97a4 Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sat, 10 Nov 2012 11:10:22 -0700
Subject: Remove unused imports in continuations.
---
src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala | 1 -
.../plugin/scala/tools/selectivecps/SelectiveANFTransform.scala | 3 ---
.../plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala | 5 -----
.../plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala | 5 -----
4 files changed, 14 deletions(-)
(limited to 'src')
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala
index eab442aaef..c591030bce 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala
@@ -7,7 +7,6 @@ import scala.tools.nsc.Global
trait CPSUtils {
val global: Global
import global._
- import definitions._
var cpsEnabled = false
val verbose: Boolean = System.getProperty("cpsVerbose", "false") == "true"
diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala
index ef13f8b1d8..f62eebaaa0 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala
@@ -2,13 +2,10 @@
package scala.tools.selectivecps
-import scala.tools.nsc._
import scala.tools.nsc.transform._
import scala.tools.nsc.symtab._
import scala.tools.nsc.plugins._
-import scala.tools.nsc.ast._
-
/**
* In methods marked @cps, explicitly name results of calls to other @cps methods
*/
diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
index 8a500d6c4d..90e64d8171 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
@@ -3,15 +3,11 @@
package scala.tools.selectivecps
import scala.tools.nsc
-import scala.tools.nsc.typechecker._
import nsc.Global
-import nsc.Phase
import nsc.plugins.Plugin
import nsc.plugins.PluginComponent
class SelectiveCPSPlugin(val global: Global) extends Plugin {
- import global._
-
val name = "continuations"
val description = "applies selective cps conversion"
@@ -26,7 +22,6 @@ class SelectiveCPSPlugin(val global: Global) extends Plugin {
override val runsBefore = List("uncurry")
}
-
val components = List[PluginComponent](anfPhase, cpsPhase)
val checker = new CPSAnnotationChecker {
diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala
index f4b0fb0419..f16cfb10f8 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala
@@ -2,13 +2,8 @@
package scala.tools.selectivecps
-import scala.collection._
-
-import scala.tools.nsc._
import scala.tools.nsc.transform._
import scala.tools.nsc.plugins._
-
-import scala.tools.nsc.ast.TreeBrowsers
import scala.tools.nsc.ast._
/**
--
cgit v1.2.3
From dbd7d718ae4a18a6b78b8d52fb554e15830eb30c Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sun, 11 Nov 2012 12:50:31 -0800
Subject: Remove unused imports in library.
---
src/library/scala/collection/BitSetLike.scala | 1 -
src/library/scala/collection/DefaultMap.scala | 6 +-----
src/library/scala/collection/GenIterableLike.scala | 2 +-
src/library/scala/collection/GenIterableView.scala | 7 -------
src/library/scala/collection/GenIterableViewLike.scala | 7 -------
src/library/scala/collection/GenSeqView.scala | 7 -------
src/library/scala/collection/GenTraversableView.scala | 7 -------
src/library/scala/collection/GenTraversableViewLike.scala | 2 --
src/library/scala/collection/IndexedSeqLike.scala | 1 -
src/library/scala/collection/Iterable.scala | 1 -
src/library/scala/collection/IterableProxy.scala | 2 --
src/library/scala/collection/IterableViewLike.scala | 1 -
src/library/scala/collection/JavaConversions.scala | 1 -
src/library/scala/collection/JavaConverters.scala | 2 --
src/library/scala/collection/LinearSeqLike.scala | 4 ----
src/library/scala/collection/LinearSeqOptimized.scala | 6 ++----
src/library/scala/collection/MapProxyLike.scala | 2 --
src/library/scala/collection/SeqViewLike.scala | 1 -
src/library/scala/collection/SetProxyLike.scala | 3 ---
src/library/scala/collection/Traversable.scala | 4 +---
src/library/scala/collection/TraversableView.scala | 1 -
src/library/scala/collection/TraversableViewLike.scala | 1 -
src/library/scala/collection/convert/Decorators.scala | 2 +-
src/library/scala/collection/generic/IterableForwarder.scala | 5 +----
src/library/scala/collection/immutable/DefaultMap.scala | 4 ----
src/library/scala/collection/immutable/List.scala | 3 ---
src/library/scala/collection/immutable/LongMap.scala | 2 --
src/library/scala/collection/immutable/NumericRange.scala | 3 ---
src/library/scala/collection/immutable/StringLike.scala | 1 -
src/library/scala/collection/immutable/StringOps.scala | 2 --
src/library/scala/collection/mutable/ArrayBuilder.scala | 3 ---
src/library/scala/collection/mutable/ArrayLike.scala | 3 ---
src/library/scala/collection/mutable/BufferProxy.scala | 3 ---
src/library/scala/collection/mutable/IndexedSeqLike.scala | 3 ---
src/library/scala/collection/mutable/IndexedSeqOptimized.scala | 3 ---
src/library/scala/collection/mutable/LinkedListLike.scala | 3 ---
src/library/scala/collection/mutable/MapLike.scala | 4 +---
src/library/scala/collection/mutable/SeqLike.scala | 1 -
src/library/scala/collection/mutable/SetBuilder.scala | 3 ---
src/library/scala/collection/mutable/SetLike.scala | 2 +-
src/library/scala/collection/mutable/SynchronizedQueue.scala | 2 --
src/library/scala/collection/mutable/SynchronizedSet.scala | 2 --
src/library/scala/collection/mutable/WrappedArrayBuilder.scala | 1 -
src/library/scala/collection/parallel/ParIterable.scala | 1 -
src/library/scala/collection/parallel/ParSeq.scala | 3 ---
src/library/scala/collection/parallel/ParSeqView.scala | 3 +--
src/library/scala/collection/parallel/ParSet.scala | 6 ------
src/library/scala/collection/parallel/ParSetLike.scala | 8 --------
src/library/scala/collection/parallel/immutable/ParIterable.scala | 2 --
src/library/scala/collection/parallel/immutable/ParSeq.scala | 3 ---
src/library/scala/collection/parallel/immutable/ParSet.scala | 1 -
src/library/scala/collection/parallel/mutable/ParIterable.scala | 2 --
src/library/scala/collection/parallel/mutable/ParMapLike.scala | 3 ---
src/library/scala/collection/parallel/mutable/ParSeq.scala | 6 ------
src/library/scala/collection/parallel/mutable/ParSet.scala | 5 -----
src/library/scala/collection/parallel/mutable/ParSetLike.scala | 6 ------
src/library/scala/concurrent/impl/Future.scala | 2 +-
src/library/scala/math/ScalaNumericConversions.scala | 2 --
src/library/scala/util/automata/WordBerrySethi.scala | 2 +-
src/library/scala/util/parsing/combinator/PackratParsers.scala | 1 -
src/library/scala/util/parsing/combinator/lexical/Scanners.scala | 3 ---
src/library/scala/util/parsing/combinator/testing/Tester.scala | 1 -
src/library/scala/util/parsing/json/JSON.scala | 3 ---
src/library/scala/util/parsing/json/Lexer.scala | 1 -
src/library/scala/util/parsing/json/Parser.scala | 1 -
src/library/scala/xml/XML.scala | 2 --
src/library/scala/xml/factory/XMLLoader.scala | 2 +-
src/library/scala/xml/include/sax/EncodingHeuristics.scala | 2 --
src/library/scala/xml/include/sax/XIncluder.scala | 2 --
src/library/scala/xml/parsing/MarkupParserCommon.scala | 1 -
70 files changed, 13 insertions(+), 185 deletions(-)
(limited to 'src')
diff --git a/src/library/scala/collection/BitSetLike.scala b/src/library/scala/collection/BitSetLike.scala
index 4a1c0beaa6..d0f4e323c7 100644
--- a/src/library/scala/collection/BitSetLike.scala
+++ b/src/library/scala/collection/BitSetLike.scala
@@ -11,7 +11,6 @@
package scala.collection
import BitSetLike._
-import generic._
import mutable.StringBuilder
/** A template trait for bitsets.
diff --git a/src/library/scala/collection/DefaultMap.scala b/src/library/scala/collection/DefaultMap.scala
index 5c91183891..cbd7e3f8b9 100644
--- a/src/library/scala/collection/DefaultMap.scala
+++ b/src/library/scala/collection/DefaultMap.scala
@@ -6,12 +6,8 @@
** |/ **
\* */
-
-
package scala.collection
-import generic._
-
/** A default map which implements the `+` and `-` methods of maps.
*
* Instances that inherit from `DefaultMap[A, B]` still have to define:
@@ -27,7 +23,7 @@ import generic._
* @since 2.8
*/
trait DefaultMap[A, +B] extends Map[A, B] { self =>
-
+
/** A default implementation which creates a new immutable map.
*/
override def +[B1 >: B](kv: (A, B1)): Map[A, B1] = {
diff --git a/src/library/scala/collection/GenIterableLike.scala b/src/library/scala/collection/GenIterableLike.scala
index 2ba9a7283d..ceb97707e1 100644
--- a/src/library/scala/collection/GenIterableLike.scala
+++ b/src/library/scala/collection/GenIterableLike.scala
@@ -8,7 +8,7 @@
package scala.collection
-import generic.{ CanBuildFrom => CBF, _ }
+import generic.{ CanBuildFrom => CBF }
/** A template trait for all iterable collections which may possibly
* have their operations implemented in parallel.
diff --git a/src/library/scala/collection/GenIterableView.scala b/src/library/scala/collection/GenIterableView.scala
index ca0332e9ad..5ab48efdf3 100644
--- a/src/library/scala/collection/GenIterableView.scala
+++ b/src/library/scala/collection/GenIterableView.scala
@@ -8,11 +8,4 @@
package scala.collection
-
-import generic._
-
-
-
trait GenIterableView[+A, +Coll] extends GenIterableViewLike[A, Coll, GenIterableView[A, Coll]] { }
-
-
diff --git a/src/library/scala/collection/GenIterableViewLike.scala b/src/library/scala/collection/GenIterableViewLike.scala
index 4e4ceb4cea..e8d264cdd4 100644
--- a/src/library/scala/collection/GenIterableViewLike.scala
+++ b/src/library/scala/collection/GenIterableViewLike.scala
@@ -8,13 +8,6 @@
package scala.collection
-
-
-import generic._
-import TraversableView.NoBuilder
-
-
-
trait GenIterableViewLike[+A,
+Coll,
+This <: GenIterableView[A, Coll] with GenIterableViewLike[A, Coll, This]]
diff --git a/src/library/scala/collection/GenSeqView.scala b/src/library/scala/collection/GenSeqView.scala
index 92c8b779e9..423f8e305e 100644
--- a/src/library/scala/collection/GenSeqView.scala
+++ b/src/library/scala/collection/GenSeqView.scala
@@ -8,11 +8,4 @@
package scala.collection
-
-import generic._
-
-
-
trait GenSeqView[+A, +Coll] extends GenSeqViewLike[A, Coll, GenSeqView[A, Coll]] { }
-
-
diff --git a/src/library/scala/collection/GenTraversableView.scala b/src/library/scala/collection/GenTraversableView.scala
index cceb06882e..1d98eff8c1 100644
--- a/src/library/scala/collection/GenTraversableView.scala
+++ b/src/library/scala/collection/GenTraversableView.scala
@@ -8,11 +8,4 @@
package scala.collection
-
-import generic._
-
-
-
trait GenTraversableView[+A, +Coll] extends GenTraversableViewLike[A, Coll, GenTraversableView[A, Coll]] { }
-
-
diff --git a/src/library/scala/collection/GenTraversableViewLike.scala b/src/library/scala/collection/GenTraversableViewLike.scala
index 77fe0802bf..8c9607663b 100644
--- a/src/library/scala/collection/GenTraversableViewLike.scala
+++ b/src/library/scala/collection/GenTraversableViewLike.scala
@@ -11,8 +11,6 @@ package scala.collection
import generic._
import mutable.{ Builder, ArrayBuffer }
-import TraversableView.NoBuilder
-
trait GenTraversableViewLike[+A,
+Coll,
diff --git a/src/library/scala/collection/IndexedSeqLike.scala b/src/library/scala/collection/IndexedSeqLike.scala
index 7d87a8a630..1d8e2b1583 100644
--- a/src/library/scala/collection/IndexedSeqLike.scala
+++ b/src/library/scala/collection/IndexedSeqLike.scala
@@ -8,7 +8,6 @@
package scala.collection
-import generic._
import mutable.ArrayBuffer
import scala.annotation.tailrec
diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala
index 5b73d720a8..09c9ce122c 100644
--- a/src/library/scala/collection/Iterable.scala
+++ b/src/library/scala/collection/Iterable.scala
@@ -11,7 +11,6 @@
package scala.collection
import generic._
-import scala.util.control.Breaks._
import mutable.Builder
/** A base trait for iterable collections.
diff --git a/src/library/scala/collection/IterableProxy.scala b/src/library/scala/collection/IterableProxy.scala
index 2d041928cc..ddb2502965 100644
--- a/src/library/scala/collection/IterableProxy.scala
+++ b/src/library/scala/collection/IterableProxy.scala
@@ -8,8 +8,6 @@
package scala.collection
-import generic._
-
/** This trait implements a proxy for iterable objects. It forwards all calls
* to a different iterable object.
*
diff --git a/src/library/scala/collection/IterableViewLike.scala b/src/library/scala/collection/IterableViewLike.scala
index 3a81a3422f..b195ae4bc7 100644
--- a/src/library/scala/collection/IterableViewLike.scala
+++ b/src/library/scala/collection/IterableViewLike.scala
@@ -9,7 +9,6 @@
package scala.collection
import generic._
-import TraversableView.NoBuilder
import immutable.Stream
import scala.language.implicitConversions
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index ce4ba870d1..7ff29650fa 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -8,7 +8,6 @@
package scala.collection
-import java.{ lang => jl, util => ju }, java.util.{ concurrent => juc }
import convert._
/** A collection of implicit conversions supporting interoperability between
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index f00c8880d2..439991708e 100755
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -8,14 +8,12 @@
package scala.collection
-import java.{ lang => jl, util => ju }, java.util.{ concurrent => juc }
import convert._
// TODO: I cleaned all this documentation up in JavaConversions, but the
// documentation in here is basically the pre-cleaned-up version with minor
// additions. Would be nice to have in one place.
-
/** A collection of decorators that allow converting between
* Scala and Java collections using `asScala` and `asJava` methods.
*
diff --git a/src/library/scala/collection/LinearSeqLike.scala b/src/library/scala/collection/LinearSeqLike.scala
index 78108a9c0f..2a824bcff3 100644
--- a/src/library/scala/collection/LinearSeqLike.scala
+++ b/src/library/scala/collection/LinearSeqLike.scala
@@ -6,13 +6,9 @@
** |/ **
\* */
-
package scala.collection
-import generic._
-import mutable.ListBuffer
import immutable.List
-import scala.util.control.Breaks._
import scala.annotation.tailrec
/** A template trait for linear sequences of type `LinearSeq[A]`.
diff --git a/src/library/scala/collection/LinearSeqOptimized.scala b/src/library/scala/collection/LinearSeqOptimized.scala
index 280326d46f..f71fd227cd 100755
--- a/src/library/scala/collection/LinearSeqOptimized.scala
+++ b/src/library/scala/collection/LinearSeqOptimized.scala
@@ -8,10 +8,8 @@
package scala.collection
-import generic._
import mutable.ListBuffer
import immutable.List
-import scala.util.control.Breaks._
/** A template trait for linear sequences of type `LinearSeq[A]` which optimizes
* the implementation of several methods under the assumption of fast linear access.
@@ -91,7 +89,7 @@ trait LinearSeqOptimized[+A, +Repr <: LinearSeqOptimized[A, Repr]] extends Linea
}
false
}
-
+
override /*IterableLike*/
def find(p: A => Boolean): Option[A] = {
var these = this
@@ -112,7 +110,7 @@ trait LinearSeqOptimized[+A, +Repr <: LinearSeqOptimized[A, Repr]] extends Linea
}
acc
}
-
+
override /*IterableLike*/
def foldRight[B](z: B)(f: (A, B) => B): B =
if (this.isEmpty) z
diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala
index 44b39f65da..ad09f7b970 100644
--- a/src/library/scala/collection/MapProxyLike.scala
+++ b/src/library/scala/collection/MapProxyLike.scala
@@ -8,8 +8,6 @@
package scala.collection
-import generic._
-
// Methods could be printed by cat MapLike.scala | egrep '^ (override )?def'
/** This trait implements a proxy for Map objects. It forwards
diff --git a/src/library/scala/collection/SeqViewLike.scala b/src/library/scala/collection/SeqViewLike.scala
index 5f2bf902b1..27536791a2 100644
--- a/src/library/scala/collection/SeqViewLike.scala
+++ b/src/library/scala/collection/SeqViewLike.scala
@@ -10,7 +10,6 @@ package scala.collection
import generic._
import Seq.fill
-import TraversableView.NoBuilder
/** A template trait for non-strict views of sequences.
* $seqViewInfo
diff --git a/src/library/scala/collection/SetProxyLike.scala b/src/library/scala/collection/SetProxyLike.scala
index 5196f39917..265d1c4806 100644
--- a/src/library/scala/collection/SetProxyLike.scala
+++ b/src/library/scala/collection/SetProxyLike.scala
@@ -6,11 +6,8 @@
** |/ **
\* */
-
package scala.collection
-import generic._
-
// Methods could be printed by cat SetLike.scala | egrep '^ (override )?def'
/** This trait implements a proxy for sets. It forwards
diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala
index 36ef230a42..4ca2095f4c 100644
--- a/src/library/scala/collection/Traversable.scala
+++ b/src/library/scala/collection/Traversable.scala
@@ -6,12 +6,10 @@
** |/ **
\* */
-
-
package scala.collection
import generic._
-import mutable.{Builder, Buffer, ArrayBuffer, ListBuffer}
+import mutable.Builder
import scala.util.control.Breaks
/** A trait for traversable collections.
diff --git a/src/library/scala/collection/TraversableView.scala b/src/library/scala/collection/TraversableView.scala
index cce6b72257..af219084b8 100644
--- a/src/library/scala/collection/TraversableView.scala
+++ b/src/library/scala/collection/TraversableView.scala
@@ -10,7 +10,6 @@ package scala.collection
import generic._
import mutable.Builder
-import TraversableView.NoBuilder
/** A base trait for non-strict views of traversable collections.
* $traversableViewInfo
diff --git a/src/library/scala/collection/TraversableViewLike.scala b/src/library/scala/collection/TraversableViewLike.scala
index 0925fe4770..6846a505bf 100644
--- a/src/library/scala/collection/TraversableViewLike.scala
+++ b/src/library/scala/collection/TraversableViewLike.scala
@@ -10,7 +10,6 @@ package scala.collection
import generic._
import mutable.{ Builder, ArrayBuffer }
-import TraversableView.NoBuilder
import scala.annotation.migration
import scala.language.implicitConversions
diff --git a/src/library/scala/collection/convert/Decorators.scala b/src/library/scala/collection/convert/Decorators.scala
index e2c46c1e4f..f004e4712b 100644
--- a/src/library/scala/collection/convert/Decorators.scala
+++ b/src/library/scala/collection/convert/Decorators.scala
@@ -9,7 +9,7 @@
package scala.collection
package convert
-import java.{ lang => jl, util => ju }, java.util.{ concurrent => juc }
+import java.{ util => ju }
private[collection] trait Decorators {
/** Generic class containing the `asJava` converter method */
diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala
index 90ebcace84..8feace3f8b 100644
--- a/src/library/scala/collection/generic/IterableForwarder.scala
+++ b/src/library/scala/collection/generic/IterableForwarder.scala
@@ -6,12 +6,9 @@
** |/ **
\* */
-
-
package scala.collection.generic
-import scala.collection._
-import scala.collection.mutable.Buffer
+import scala.collection._
/** This trait implements a forwarder for iterable objects. It forwards
* all calls to a different iterable object, except for
diff --git a/src/library/scala/collection/immutable/DefaultMap.scala b/src/library/scala/collection/immutable/DefaultMap.scala
index 4a0503adfd..620baec9a8 100755
--- a/src/library/scala/collection/immutable/DefaultMap.scala
+++ b/src/library/scala/collection/immutable/DefaultMap.scala
@@ -6,13 +6,9 @@
** |/ **
\* */
-
-
package scala.collection
package immutable
-import generic._
-
/** A default map which implements the `+` and `-`
* methods of maps. It does so using the default builder for
* maps defined in the `Map` object.
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index 1ebbff53ea..aeaa479e2f 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -386,9 +386,6 @@ final case class ::[B](private var hd: B, private[scala] var tl: List[B]) extend
* @define Coll `List`
*/
object List extends SeqFactory[List] {
-
- import scala.collection.{Iterable, Seq, IndexedSeq}
-
/** $genericCanBuildFromInfo */
implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, List[A]] =
ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]]
diff --git a/src/library/scala/collection/immutable/LongMap.scala b/src/library/scala/collection/immutable/LongMap.scala
index 2a2910439a..fab1b7f00b 100644
--- a/src/library/scala/collection/immutable/LongMap.scala
+++ b/src/library/scala/collection/immutable/LongMap.scala
@@ -77,8 +77,6 @@ object LongMap {
}
}
-import LongMap._
-
// Iterator over a non-empty LongMap.
private[immutable] abstract class LongMapIterator[V, T](it: LongMap[V]) extends AbstractIterator[T] {
diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala
index 9e64bee1ce..195aeed281 100644
--- a/src/library/scala/collection/immutable/NumericRange.scala
+++ b/src/library/scala/collection/immutable/NumericRange.scala
@@ -6,12 +6,10 @@
** |/ **
\* */
-
package scala.collection
package immutable
import mutable.{ Builder, ListBuffer }
-import generic._
/** `NumericRange` is a more generic version of the
* `Range` class which works with arbitrary types.
@@ -176,7 +174,6 @@ extends AbstractSeq[T] with IndexedSeq[T] with Serializable {
catch { case _: ClassCastException => false }
final override def sum[B >: T](implicit num: Numeric[B]): B = {
- import num.Ops
if (isEmpty) this.num fromInt 0
else if (numRangeElements == 1) head
else ((this.num fromInt numRangeElements) * (head + last) / (this.num fromInt 2))
diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala
index 68bef42c34..663318330c 100644
--- a/src/library/scala/collection/immutable/StringLike.scala
+++ b/src/library/scala/collection/immutable/StringLike.scala
@@ -9,7 +9,6 @@
package scala.collection
package immutable
-import generic._
import mutable.Builder
import scala.util.matching.Regex
import scala.math.ScalaNumber
diff --git a/src/library/scala/collection/immutable/StringOps.scala b/src/library/scala/collection/immutable/StringOps.scala
index a650d98697..16c1f96cc2 100644
--- a/src/library/scala/collection/immutable/StringOps.scala
+++ b/src/library/scala/collection/immutable/StringOps.scala
@@ -6,8 +6,6 @@
** |/ **
\* */
-
-
package scala.collection
package immutable
diff --git a/src/library/scala/collection/mutable/ArrayBuilder.scala b/src/library/scala/collection/mutable/ArrayBuilder.scala
index 0ce2cda32c..2fe3e91d68 100644
--- a/src/library/scala/collection/mutable/ArrayBuilder.scala
+++ b/src/library/scala/collection/mutable/ArrayBuilder.scala
@@ -6,12 +6,9 @@
** |/ **
\* */
-
-
package scala.collection
package mutable
-import generic._
import scala.reflect.ClassTag
import scala.runtime.ScalaRunTime
diff --git a/src/library/scala/collection/mutable/ArrayLike.scala b/src/library/scala/collection/mutable/ArrayLike.scala
index 31f3d2a497..40017aa08e 100644
--- a/src/library/scala/collection/mutable/ArrayLike.scala
+++ b/src/library/scala/collection/mutable/ArrayLike.scala
@@ -6,11 +6,8 @@
** |/ **
\* */
-
-
package scala.collection
package mutable
-import generic._
/** A common supertrait of `ArrayOps` and `WrappedArray` that factors out most
* operations on arrays and wrapped arrays.
diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala
index 37aa1862fa..ade0b94230 100644
--- a/src/library/scala/collection/mutable/BufferProxy.scala
+++ b/src/library/scala/collection/mutable/BufferProxy.scala
@@ -6,12 +6,9 @@
** |/ **
\* */
-
-
package scala.collection
package mutable
-import generic._
import script._
/** This is a simple proxy class for
- import scala.collection.Traversable
-
/** A common implementation of `newBuilder` for all mutable maps
* in terms of `empty`.
*
diff --git a/src/library/scala/collection/mutable/SeqLike.scala b/src/library/scala/collection/mutable/SeqLike.scala
index 447100cf4c..ddfde536c9 100644
--- a/src/library/scala/collection/mutable/SeqLike.scala
+++ b/src/library/scala/collection/mutable/SeqLike.scala
@@ -9,7 +9,6 @@
package scala.collection
package mutable
-import generic._
import parallel.mutable.ParSeq
/** A template trait for mutable sequences of type `mutable.Seq[A]`.
diff --git a/src/library/scala/collection/mutable/SetBuilder.scala b/src/library/scala/collection/mutable/SetBuilder.scala
index 42fd651d41..40f0b8932c 100644
--- a/src/library/scala/collection/mutable/SetBuilder.scala
+++ b/src/library/scala/collection/mutable/SetBuilder.scala
@@ -6,12 +6,9 @@
** |/ **
\* */
-
package scala.collection
package mutable
-import generic._
-
/** The canonical builder for mutable Sets.
*
* @tparam A The type of the elements that will be contained in this set.
diff --git a/src/library/scala/collection/mutable/SetLike.scala b/src/library/scala/collection/mutable/SetLike.scala
index 01f87447ae..4a907e7dc4 100644
--- a/src/library/scala/collection/mutable/SetLike.scala
+++ b/src/library/scala/collection/mutable/SetLike.scala
@@ -11,7 +11,7 @@ package mutable
import generic._
import script._
-import scala.annotation.{ migration, bridge }
+import scala.annotation.migration
import parallel.mutable.ParSet
/** A template trait for mutable sets of type `mutable.Set[A]`.
diff --git a/src/library/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala
index 9559d5eaa5..c5f133eec7 100644
--- a/src/library/scala/collection/mutable/SynchronizedQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedQueue.scala
@@ -25,8 +25,6 @@ package mutable
* @define coll synchronized queue
*/
class SynchronizedQueue[A] extends Queue[A] {
- import scala.collection.Traversable
-
/** Checks if the queue is empty.
*
* @return true, iff there is no element in the queue.
diff --git a/src/library/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala
index e4a44993ff..bc9873880c 100644
--- a/src/library/scala/collection/mutable/SynchronizedSet.scala
+++ b/src/library/scala/collection/mutable/SynchronizedSet.scala
@@ -24,8 +24,6 @@ import script._
* @define coll synchronized set
*/
trait SynchronizedSet[A] extends Set[A] {
- import scala.collection.Traversable
-
abstract override def size: Int = synchronized {
super.size
}
diff --git a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
index 7e0210311c..55328a5d3d 100644
--- a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
+++ b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
@@ -11,7 +11,6 @@
package scala.collection
package mutable
-import generic._
import scala.reflect.ClassTag
import scala.runtime.ScalaRunTime._
diff --git a/src/library/scala/collection/parallel/ParIterable.scala b/src/library/scala/collection/parallel/ParIterable.scala
index 2b24c88139..f170b944eb 100644
--- a/src/library/scala/collection/parallel/ParIterable.scala
+++ b/src/library/scala/collection/parallel/ParIterable.scala
@@ -11,7 +11,6 @@ package scala.collection.parallel
import scala.collection.GenIterable
import scala.collection.generic._
import scala.collection.parallel.mutable.ParArrayCombiner
-import scala.collection.parallel.mutable.ParArray
/** A template trait for parallel iterable collections.
*
diff --git a/src/library/scala/collection/parallel/ParSeq.scala b/src/library/scala/collection/parallel/ParSeq.scala
index b905d1d41f..dee523ad89 100644
--- a/src/library/scala/collection/parallel/ParSeq.scala
+++ b/src/library/scala/collection/parallel/ParSeq.scala
@@ -18,9 +18,6 @@ import scala.collection.generic.ParFactory
import scala.collection.generic.CanCombineFrom
import scala.collection.GenSeq
import scala.collection.parallel.mutable.ParArrayCombiner
-import scala.collection.parallel.mutable.ParArray
-
-
/** A template trait for parallel sequences.
*
diff --git a/src/library/scala/collection/parallel/ParSeqView.scala b/src/library/scala/collection/parallel/ParSeqView.scala
index 3e3c497352..9acc4b0b73 100644
--- a/src/library/scala/collection/parallel/ParSeqView.scala
+++ b/src/library/scala/collection/parallel/ParSeqView.scala
@@ -6,10 +6,9 @@
** |/ **
\* */
-
package scala.collection.parallel
-import scala.collection.{ TraversableView, SeqView, Parallel, Iterator }
+import scala.collection.{ SeqView, Parallel, Iterator }
import scala.collection.generic.CanCombineFrom
/** A template view of a non-strict view of a parallel sequence.
diff --git a/src/library/scala/collection/parallel/ParSet.scala b/src/library/scala/collection/parallel/ParSet.scala
index 6e5e9b4387..bc6d5c6245 100644
--- a/src/library/scala/collection/parallel/ParSet.scala
+++ b/src/library/scala/collection/parallel/ParSet.scala
@@ -17,14 +17,8 @@ package scala.collection.parallel
import scala.collection.Set
import scala.collection.GenSet
-import scala.collection.mutable.Builder
import scala.collection.generic._
-
-
-
-
-
/** A template trait for parallel sets.
*
* $sideeffects
diff --git a/src/library/scala/collection/parallel/ParSetLike.scala b/src/library/scala/collection/parallel/ParSetLike.scala
index c80b5ded26..20a5f693ce 100644
--- a/src/library/scala/collection/parallel/ParSetLike.scala
+++ b/src/library/scala/collection/parallel/ParSetLike.scala
@@ -15,14 +15,6 @@ import scala.collection.SetLike
import scala.collection.GenSetLike
import scala.collection.GenSet
import scala.collection.Set
-import scala.collection.mutable.Builder
-
-
-
-
-
-
-
/** A template trait for parallel sets. This trait is mixed in with concrete
* parallel sets to override the representation type.
diff --git a/src/library/scala/collection/parallel/immutable/ParIterable.scala b/src/library/scala/collection/parallel/immutable/ParIterable.scala
index 142f07ff26..ec07e44c4d 100644
--- a/src/library/scala/collection/parallel/immutable/ParIterable.scala
+++ b/src/library/scala/collection/parallel/immutable/ParIterable.scala
@@ -15,8 +15,6 @@ import scala.collection.generic._
import scala.collection.parallel.ParIterableLike
import scala.collection.parallel.Combiner
-import scala.collection.GenIterable
-
/** A template trait for immutable parallel iterable collections.
*
diff --git a/src/library/scala/collection/parallel/immutable/ParSeq.scala b/src/library/scala/collection/parallel/immutable/ParSeq.scala
index aa19307387..b54a5f0205 100644
--- a/src/library/scala/collection/parallel/immutable/ParSeq.scala
+++ b/src/library/scala/collection/parallel/immutable/ParSeq.scala
@@ -18,9 +18,6 @@ import scala.collection.generic.CanCombineFrom
import scala.collection.generic.ParFactory
import scala.collection.parallel.ParSeqLike
import scala.collection.parallel.Combiner
-import scala.collection.GenSeq
-
-
/** An immutable variant of `ParSeq`.
*
diff --git a/src/library/scala/collection/parallel/immutable/ParSet.scala b/src/library/scala/collection/parallel/immutable/ParSet.scala
index 3622377a55..aba8486ab5 100644
--- a/src/library/scala/collection/parallel/immutable/ParSet.scala
+++ b/src/library/scala/collection/parallel/immutable/ParSet.scala
@@ -9,7 +9,6 @@
package scala.collection
package parallel.immutable
-import scala.collection.GenSet
import scala.collection.generic._
import scala.collection.parallel.ParSetLike
import scala.collection.parallel.Combiner
diff --git a/src/library/scala/collection/parallel/mutable/ParIterable.scala b/src/library/scala/collection/parallel/mutable/ParIterable.scala
index 7090c510a0..d76e4b1745 100644
--- a/src/library/scala/collection/parallel/mutable/ParIterable.scala
+++ b/src/library/scala/collection/parallel/mutable/ParIterable.scala
@@ -12,8 +12,6 @@ package scala.collection.parallel.mutable
import scala.collection.generic._
import scala.collection.parallel.ParIterableLike
import scala.collection.parallel.Combiner
-import scala.collection.GenIterable
-
/** A template trait for mutable parallel iterable collections.
*
diff --git a/src/library/scala/collection/parallel/mutable/ParMapLike.scala b/src/library/scala/collection/parallel/mutable/ParMapLike.scala
index cdcfc59f8f..08bc706c8a 100644
--- a/src/library/scala/collection/parallel/mutable/ParMapLike.scala
+++ b/src/library/scala/collection/parallel/mutable/ParMapLike.scala
@@ -12,13 +12,10 @@ package mutable
import scala.collection.generic._
-import scala.collection.mutable.Builder
import scala.collection.mutable.Cloneable
import scala.collection.generic.Growable
import scala.collection.generic.Shrinkable
-
-
/** A template trait for mutable parallel maps. This trait is to be mixed in
* with concrete parallel maps to override the representation type.
*
diff --git a/src/library/scala/collection/parallel/mutable/ParSeq.scala b/src/library/scala/collection/parallel/mutable/ParSeq.scala
index 95a4d4a13a..8a55ab83f1 100644
--- a/src/library/scala/collection/parallel/mutable/ParSeq.scala
+++ b/src/library/scala/collection/parallel/mutable/ParSeq.scala
@@ -17,12 +17,6 @@ import scala.collection.generic.CanCombineFrom
import scala.collection.generic.ParFactory
import scala.collection.parallel.ParSeqLike
import scala.collection.parallel.Combiner
-import scala.collection.GenSeq
-
-
-
-
-
/** A mutable variant of `ParSeq`.
*
diff --git a/src/library/scala/collection/parallel/mutable/ParSet.scala b/src/library/scala/collection/parallel/mutable/ParSet.scala
index d8f821746c..ca41852512 100644
--- a/src/library/scala/collection/parallel/mutable/ParSet.scala
+++ b/src/library/scala/collection/parallel/mutable/ParSet.scala
@@ -13,11 +13,6 @@ package scala.collection.parallel.mutable
import scala.collection.generic._
import scala.collection.parallel.Combiner
-import scala.collection.GenSet
-
-
-
-
/** A mutable variant of `ParSet`.
*
diff --git a/src/library/scala/collection/parallel/mutable/ParSetLike.scala b/src/library/scala/collection/parallel/mutable/ParSetLike.scala
index 609888f1a9..0941229124 100644
--- a/src/library/scala/collection/parallel/mutable/ParSetLike.scala
+++ b/src/library/scala/collection/parallel/mutable/ParSetLike.scala
@@ -10,17 +10,11 @@
package scala.collection
package parallel.mutable
-
-
-import scala.collection.mutable.Set
-import scala.collection.mutable.Builder
import scala.collection.mutable.Cloneable
import scala.collection.GenSetLike
import scala.collection.generic.Growable
import scala.collection.generic.Shrinkable
-
-
/** A template trait for mutable parallel sets. This trait is mixed in with concrete
* parallel sets to override the representation type.
*
diff --git a/src/library/scala/concurrent/impl/Future.scala b/src/library/scala/concurrent/impl/Future.scala
index 8c2a77c75f..055ce6e4fa 100644
--- a/src/library/scala/concurrent/impl/Future.scala
+++ b/src/library/scala/concurrent/impl/Future.scala
@@ -12,7 +12,7 @@ package scala.concurrent.impl
import scala.concurrent.ExecutionContext
import scala.util.control.NonFatal
-import scala.util.{Try, Success, Failure}
+import scala.util.{ Success, Failure }
private[concurrent] object Future {
diff --git a/src/library/scala/math/ScalaNumericConversions.scala b/src/library/scala/math/ScalaNumericConversions.scala
index 6ddf48d03b..59fc7f27b2 100644
--- a/src/library/scala/math/ScalaNumericConversions.scala
+++ b/src/library/scala/math/ScalaNumericConversions.scala
@@ -8,8 +8,6 @@
package scala.math
-import java.{ lang => jl }
-
/** A slightly more specific conversion trait for classes which
* extend ScalaNumber (which excludes value classes.)
*/
diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala
index 3dcbf65aca..2f4625da44 100644
--- a/src/library/scala/util/automata/WordBerrySethi.scala
+++ b/src/library/scala/util/automata/WordBerrySethi.scala
@@ -21,7 +21,7 @@ import scala.util.regexp.WordExp
abstract class WordBerrySethi extends BaseBerrySethi {
override val lang: WordExp
- import lang.{ Alt, Eps, Letter, Meta, RegExp, Sequ, Star, _labelT }
+ import lang.{ Alt, Eps, Letter, RegExp, Sequ, Star, _labelT }
protected var labels: mutable.HashSet[_labelT] = _
// don't let this fool you, only labelAt is a real, surjective mapping
diff --git a/src/library/scala/util/parsing/combinator/PackratParsers.scala b/src/library/scala/util/parsing/combinator/PackratParsers.scala
index 16705d45f9..cd0907e40f 100644
--- a/src/library/scala/util/parsing/combinator/PackratParsers.scala
+++ b/src/library/scala/util/parsing/combinator/PackratParsers.scala
@@ -8,7 +8,6 @@
package scala.util.parsing.combinator
-import scala.util.parsing.combinator._
import scala.util.parsing.input.{ Reader, Position }
import scala.collection.mutable
import scala.language.implicitConversions
diff --git a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala
index 5c23ad70cd..f6a8daabd9 100644
--- a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala
+++ b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala
@@ -6,13 +6,10 @@
** |/ **
\* */
-
-
package scala.util.parsing
package combinator
package lexical
-import token._
import input._
/** This component provides core functionality for lexical parsers.
diff --git a/src/library/scala/util/parsing/combinator/testing/Tester.scala b/src/library/scala/util/parsing/combinator/testing/Tester.scala
index 95730ee292..3cdab2a885 100644
--- a/src/library/scala/util/parsing/combinator/testing/Tester.scala
+++ b/src/library/scala/util/parsing/combinator/testing/Tester.scala
@@ -7,7 +7,6 @@
\* */
package scala.util.parsing.combinator.testing
-import scala.util.parsing.combinator._
import scala.util.parsing.combinator.lexical.Lexical
import scala.util.parsing.combinator.syntactical.TokenParsers
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala
index 2f450ed864..8f951d519a 100644
--- a/src/library/scala/util/parsing/json/JSON.scala
+++ b/src/library/scala/util/parsing/json/JSON.scala
@@ -7,9 +7,6 @@
\* */
package scala.util.parsing.json
-import scala.util.parsing.combinator._
-import scala.util.parsing.combinator.syntactical._
-import scala.util.parsing.combinator.lexical._
/**
* This object provides a simple interface to the JSON parser class.
diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/library/scala/util/parsing/json/Lexer.scala
index 991b5d5c6c..762c1352a7 100644
--- a/src/library/scala/util/parsing/json/Lexer.scala
+++ b/src/library/scala/util/parsing/json/Lexer.scala
@@ -11,7 +11,6 @@
package scala.util.parsing.json
import scala.util.parsing.combinator._
-import scala.util.parsing.combinator.syntactical._
import scala.util.parsing.combinator.lexical._
import scala.util.parsing.input.CharArrayReader.EofCh
diff --git a/src/library/scala/util/parsing/json/Parser.scala b/src/library/scala/util/parsing/json/Parser.scala
index cb87866f07..bf1162000b 100644
--- a/src/library/scala/util/parsing/json/Parser.scala
+++ b/src/library/scala/util/parsing/json/Parser.scala
@@ -12,7 +12,6 @@ package scala.util.parsing.json
import scala.util.parsing.combinator._
import scala.util.parsing.combinator.syntactical._
-import scala.util.parsing.combinator.lexical._
/**
* A marker class for the JSON result types.
diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala
index d101684459..ec5e5e9e1c 100755
--- a/src/library/scala/xml/XML.scala
+++ b/src/library/scala/xml/XML.scala
@@ -45,8 +45,6 @@ object MinimizeMode extends Enumeration {
val Never = Value
}
-import Source._
-
/** The object `XML` provides constants, and functions to load
* and save XML elements. Use this when data binding is not desired, i.e.
* when XML is handled using `Symbol` nodes.
diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala
index 72e4c51b11..efa241e388 100644
--- a/src/library/scala/xml/factory/XMLLoader.scala
+++ b/src/library/scala/xml/factory/XMLLoader.scala
@@ -12,7 +12,7 @@ package factory
import javax.xml.parsers.SAXParserFactory
import parsing.{ FactoryAdapter, NoBindingFactoryAdapter }
-import java.io.{ InputStream, Reader, StringReader, File, FileDescriptor, FileInputStream }
+import java.io.{ InputStream, Reader, File, FileDescriptor }
import java.net.URL
/** Presents collection of XML loading methods which use the parser
diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/library/scala/xml/include/sax/EncodingHeuristics.scala
index 1340689cae..8d8ce5b290 100644
--- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala
+++ b/src/library/scala/xml/include/sax/EncodingHeuristics.scala
@@ -6,10 +6,8 @@
** |/ **
\* */
-
package scala.xml
package include.sax
-import scala.xml.include._
import java.io.InputStream
import scala.util.matching.Regex
diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala
index 5064d6b3d8..81c5613541 100644
--- a/src/library/scala/xml/include/sax/XIncluder.scala
+++ b/src/library/scala/xml/include/sax/XIncluder.scala
@@ -6,11 +6,9 @@
** |/ **
\* */
-
package scala.xml
package include.sax
-import scala.xml.include._
import scala.collection.mutable
import org.xml.sax.{ ContentHandler, XMLReader, Locator, Attributes }
import org.xml.sax.ext.LexicalHandler
diff --git a/src/library/scala/xml/parsing/MarkupParserCommon.scala b/src/library/scala/xml/parsing/MarkupParserCommon.scala
index da640484e0..43ec539931 100644
--- a/src/library/scala/xml/parsing/MarkupParserCommon.scala
+++ b/src/library/scala/xml/parsing/MarkupParserCommon.scala
@@ -10,7 +10,6 @@ package scala.xml
package parsing
import scala.io.Source
-import scala.xml.dtd._
import scala.annotation.switch
import Utility.Escapes.{ pairs => unescape }
--
cgit v1.2.3
From 120879e2f5a10beaa94ef9e886e67a1c092fded0 Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sat, 10 Nov 2012 15:52:25 -0700
Subject: Deal with possibly spurious warning in Macros.
---
src/compiler/scala/tools/nsc/typechecker/Macros.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index 09f3fefeba..4b534b0d2e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -720,16 +720,15 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
/** Does the same as `macroExpand`, but without typechecking the expansion
* Meant for internal use within the macro infrastructure, don't use it elsewhere.
*/
- private def macroExpand1(typer: Typer, expandee: Tree): MacroExpansionResult =
+ private def macroExpand1(typer: Typer, expandee: Tree): MacroExpansionResult = {
// verbose printing might cause recursive macro expansions, so I'm shutting it down here
withInfoLevel(nodePrinters.InfoLevel.Quiet) {
if (expandee.symbol.isErroneous || (expandee exists (_.isErroneous))) {
val reason = if (expandee.symbol.isErroneous) "not found or incompatible macro implementation" else "erroneous arguments"
macroTraceVerbose("cancelled macro expansion because of %s: ".format(reason))(expandee)
- return Cancel(typer.infer.setError(expandee))
+ Cancel(typer.infer.setError(expandee))
}
-
- try {
+ else try {
val runtime = macroRuntime(expandee.symbol)
if (runtime != null) macroExpandWithRuntime(typer, expandee, runtime)
else macroExpandWithoutRuntime(typer, expandee)
@@ -737,6 +736,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
case typer.TyperErrorGen.MacroExpansionException => Failure(expandee)
}
}
+ }
/** Expands a macro when a runtime (i.e. the macro implementation) can be successfully loaded
* Meant for internal use within the macro infrastructure, don't use it elsewhere.
--
cgit v1.2.3
From 345f937b3441f248ac9156484758fa17b1a78941 Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Sun, 11 Nov 2012 17:34:16 -0800
Subject: applyOrElse is a synthetic method.
---
src/compiler/scala/tools/nsc/transform/UnCurry.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index 84803d0b6b..a3340bcc16 100644
--- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -336,7 +336,7 @@ abstract class UnCurry extends InfoTransform
// def applyOrElse[A1 <: A, B1 >: B](x: A1, default: A1 => B1): B1 =
val applyOrElseMethodDef = {
- val methSym = anonClass.newMethod(nme.applyOrElse, fun.pos, newFlags = FINAL | OVERRIDE)
+ val methSym = anonClass.newMethod(nme.applyOrElse, fun.pos, newFlags = FINAL | OVERRIDE | SYNTHETIC)
val List(argtpe) = formals
val A1 = methSym newTypeParameter(newTypeName("A1")) setInfo TypeBounds.upper(argtpe)
--
cgit v1.2.3
From 645c2676dd6699ac24a57dfe750386bbdb827ee8 Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Mon, 12 Nov 2012 23:21:47 -0800
Subject: Commenting out unused members.
I want to get this commit into the history because
the tests pass here, which demonstrates that every commented
out method is not only unnecessary internally but has zero
test coverage. Since I know (based on the occasional source
code comment, or more often based on knowing something about
other source bases) that some of these can't be removed
without breaking other things, I want to at least record
a snapshot of the identities of all these unused and
untested methods.
This commit will be reverted; then there will be another
commit which removes the subset of these methods which I
believe to be removable. The remainder are in great need of
tests which exercise the interfaces upon which other
repositories depend.
---
src/compiler/scala/reflect/reify/Errors.scala | 8 +-
.../scala/reflect/reify/codegen/GenUtils.scala | 40 ++--
.../scala/reflect/reify/phases/Metalevels.scala | 4 +-
.../scala/reflect/reify/utils/SymbolTables.scala | 2 +-
src/compiler/scala/tools/ant/sabbus/Settings.scala | 2 +-
src/compiler/scala/tools/cmd/FromString.scala | 14 +-
src/compiler/scala/tools/cmd/Reference.scala | 2 +-
.../scala/tools/nsc/CompilationUnits.scala | 22 +-
src/compiler/scala/tools/nsc/CompileServer.scala | 2 +-
src/compiler/scala/tools/nsc/CompilerCommand.scala | 6 +-
src/compiler/scala/tools/nsc/CompilerRun.scala | 36 +--
src/compiler/scala/tools/nsc/Global.scala | 107 +++++----
src/compiler/scala/tools/nsc/ObjectRunner.scala | 4 +-
src/compiler/scala/tools/nsc/Phases.scala | 4 +-
src/compiler/scala/tools/nsc/Properties.scala | 2 +-
src/compiler/scala/tools/nsc/ScriptRunner.scala | 2 +-
src/compiler/scala/tools/nsc/ast/DocComments.scala | 8 +-
src/compiler/scala/tools/nsc/ast/Printers.scala | 82 +------
src/compiler/scala/tools/nsc/ast/TreeDSL.scala | 76 +++----
src/compiler/scala/tools/nsc/ast/TreeGen.scala | 170 +++++++--------
src/compiler/scala/tools/nsc/ast/TreeInfo.scala | 6 +-
.../scala/tools/nsc/ast/parser/Parsers.scala | 25 ++-
.../scala/tools/nsc/ast/parser/Scanners.scala | 59 ++---
.../scala/tools/nsc/ast/parser/Tokens.scala | 62 +++---
.../scala/tools/nsc/ast/parser/TreeBuilder.scala | 26 +--
.../tools/nsc/backend/icode/BasicBlocks.scala | 36 +--
.../nsc/backend/icode/ExceptionHandlers.scala | 10 +-
.../scala/tools/nsc/backend/icode/GenICode.scala | 28 +--
.../scala/tools/nsc/backend/icode/Members.scala | 50 ++---
.../scala/tools/nsc/backend/icode/Opcodes.scala | 20 +-
.../scala/tools/nsc/backend/icode/Primitives.scala | 16 +-
.../scala/tools/nsc/backend/icode/Repository.scala | 14 +-
.../scala/tools/nsc/backend/icode/TypeKinds.scala | 4 +-
.../scala/tools/nsc/backend/icode/TypeStacks.scala | 6 +-
.../backend/icode/analysis/CopyPropagation.scala | 20 +-
.../backend/icode/analysis/DataFlowAnalysis.scala | 10 +-
.../backend/icode/analysis/TypeFlowAnalysis.scala | 62 +++---
.../scala/tools/nsc/backend/jvm/GenASM.scala | 12 +-
.../scala/tools/nsc/backend/jvm/GenJVM.scala | 26 +--
.../scala/tools/nsc/backend/msil/GenMSIL.scala | 12 +-
.../tools/nsc/backend/opt/ClosureElimination.scala | 4 +-
.../scala/tools/nsc/backend/opt/Inliners.scala | 6 +-
src/compiler/scala/tools/nsc/doc/html/Page.scala | 6 +-
.../scala/tools/nsc/doc/model/Entity.scala | 14 +-
.../tools/nsc/doc/model/IndexModelFactory.scala | 2 +-
.../scala/tools/nsc/doc/model/ModelFactory.scala | 48 ++--
.../doc/model/ModelFactoryImplicitSupport.scala | 32 +--
.../tools/nsc/doc/model/comment/Comment.scala | 2 +-
.../nsc/doc/model/comment/CommentFactory.scala | 36 +--
.../tools/nsc/doc/model/diagram/Diagram.scala | 18 +-
.../scala/tools/nsc/interactive/BuildManager.scala | 2 +-
.../scala/tools/nsc/interactive/Global.scala | 68 +++---
.../scala/tools/nsc/interpreter/ByteCode.scala | 28 +--
.../scala/tools/nsc/interpreter/CodeHandlers.scala | 100 ++++-----
.../scala/tools/nsc/interpreter/CommandLine.scala | 2 +-
.../scala/tools/nsc/interpreter/Completion.scala | 2 +-
.../tools/nsc/interpreter/CompletionAware.scala | 46 ++--
.../tools/nsc/interpreter/CompletionOutput.scala | 2 +-
.../nsc/interpreter/ConsoleReaderHelper.scala | 10 +-
.../scala/tools/nsc/interpreter/Delimited.scala | 6 +-
.../scala/tools/nsc/interpreter/ExprTyper.scala | 9 +-
.../scala/tools/nsc/interpreter/ILoop.scala | 55 +++--
.../scala/tools/nsc/interpreter/IMain.scala | 199 ++++++++---------
.../scala/tools/nsc/interpreter/ISettings.scala | 10 +-
.../scala/tools/nsc/interpreter/Imports.scala | 22 +-
.../tools/nsc/interpreter/InteractiveReader.scala | 12 +-
.../tools/nsc/interpreter/JLineCompletion.scala | 12 +-
.../scala/tools/nsc/interpreter/JLineReader.scala | 8 +-
.../scala/tools/nsc/interpreter/Logger.scala | 6 +-
.../scala/tools/nsc/interpreter/LoopCommands.scala | 38 ++--
.../tools/nsc/interpreter/MemberHandlers.scala | 26 +--
.../scala/tools/nsc/interpreter/NamedParam.scala | 6 +-
.../scala/tools/nsc/interpreter/Naming.scala | 2 +-
.../scala/tools/nsc/interpreter/Parsed.scala | 14 +-
.../scala/tools/nsc/interpreter/Phased.scala | 30 +--
.../scala/tools/nsc/interpreter/Power.scala | 152 ++++++-------
.../scala/tools/nsc/interpreter/ReplConfig.scala | 24 +-
.../scala/tools/nsc/interpreter/ReplProps.scala | 6 +-
.../scala/tools/nsc/interpreter/ReplStrings.scala | 2 +-
.../scala/tools/nsc/interpreter/RichClass.scala | 7 +-
.../scala/tools/nsc/interpreter/SimpleReader.scala | 8 +-
.../scala/tools/nsc/interpreter/TypeStrings.scala | 18 +-
.../scala/tools/nsc/interpreter/package.scala | 54 ++---
.../tools/nsc/interpreter/session/History.scala | 10 +-
.../nsc/interpreter/session/SimpleHistory.scala | 6 +-
src/compiler/scala/tools/nsc/io/Fileish.scala | 52 ++---
src/compiler/scala/tools/nsc/io/Jar.scala | 24 +-
src/compiler/scala/tools/nsc/io/MsilFile.scala | 2 +-
src/compiler/scala/tools/nsc/io/Pickler.scala | 74 +++----
src/compiler/scala/tools/nsc/io/Socket.scala | 8 +-
src/compiler/scala/tools/nsc/io/SourceReader.scala | 2 +-
src/compiler/scala/tools/nsc/io/package.scala | 22 +-
.../scala/tools/nsc/javac/JavaParsers.scala | 8 +-
.../scala/tools/nsc/javac/JavaScanners.scala | 48 ++--
.../scala/tools/nsc/javac/JavaTokens.scala | 12 +-
.../scala/tools/nsc/matching/MatchSupport.scala | 38 ++--
src/compiler/scala/tools/nsc/matching/Matrix.scala | 48 ++--
.../tools/nsc/matching/ParallelMatching.scala | 6 +-
.../scala/tools/nsc/matching/PatternBindings.scala | 2 +-
.../scala/tools/nsc/matching/Patterns.scala | 48 ++--
.../scala/tools/nsc/settings/AbsSettings.scala | 16 +-
.../tools/nsc/settings/AdvancedScalaSettings.scala | 148 ++++++-------
.../scala/tools/nsc/settings/MutableSettings.scala | 10 +-
.../scala/tools/nsc/settings/ScalaSettings.scala | 10 +-
.../tools/nsc/settings/StandardScalaSettings.scala | 2 +-
.../scala/tools/nsc/settings/Warnings.scala | 14 +-
.../nsc/symtab/classfile/AbstractFileReader.scala | 12 +-
.../nsc/symtab/classfile/ClassfileParser.scala | 20 +-
.../tools/nsc/symtab/classfile/ICodeReader.scala | 6 +-
.../scala/tools/nsc/symtab/classfile/Pickler.scala | 208 +++++++++---------
.../tools/nsc/transform/SpecializeTypes.scala | 28 +--
.../scala/tools/nsc/transform/TailCalls.scala | 2 +-
.../tools/nsc/transform/TypingTransformers.scala | 2 +-
.../scala/tools/nsc/typechecker/Contexts.scala | 32 +--
.../tools/nsc/typechecker/DestructureTypes.scala | 20 +-
.../scala/tools/nsc/typechecker/Duplicators.scala | 38 ++--
.../scala/tools/nsc/typechecker/Implicits.scala | 12 +-
.../tools/nsc/typechecker/MethodSynthesis.scala | 70 +++---
.../scala/tools/nsc/typechecker/Namers.scala | 22 +-
.../tools/nsc/typechecker/NamesDefaults.scala | 2 +-
.../tools/nsc/typechecker/PatternMatching.scala | 102 ++++-----
.../scala/tools/nsc/typechecker/TreeCheckers.scala | 14 +-
.../tools/nsc/typechecker/TypeDiagnostics.scala | 16 +-
.../scala/tools/nsc/typechecker/Typers.scala | 14 +-
.../scala/tools/nsc/typechecker/Unapplies.scala | 10 +-
src/compiler/scala/tools/nsc/util/ClassPath.scala | 44 ++--
.../scala/tools/nsc/util/CommandLineParser.scala | 8 +-
.../scala/tools/nsc/util/JavaCharArrayReader.scala | 51 ++---
.../scala/tools/nsc/util/ScalaClassLoader.scala | 62 +++---
.../scala/tools/nsc/util/SimpleTracer.scala | 2 +-
src/compiler/scala/tools/nsc/util/package.scala | 22 +-
.../scala/tools/reflect/ToolBoxFactory.scala | 4 +-
src/compiler/scala/tools/util/Javap.scala | 4 +-
src/compiler/scala/tools/util/PathResolver.scala | 12 +-
.../scala/util/continuations/ControlContext.scala | 4 +-
.../library/scala/util/continuations/package.scala | 6 +-
src/detach/plugin/scala/tools/detach/Detach.scala | 2 +-
src/partest/scala/tools/partest/CompilerTest.scala | 3 +-
src/partest/scala/tools/partest/SecurityTest.scala | 22 +-
src/partest/scala/tools/partest/TestUtil.scala | 14 +-
.../partest/instrumented/Instrumentation.scala | 1 +
.../tools/partest/nest/ConsoleFileManager.scala | 20 +-
.../scala/tools/partest/nest/ConsoleRunner.scala | 2 +-
.../scala/tools/partest/nest/FileManager.scala | 8 +-
src/partest/scala/tools/partest/nest/NestUI.scala | 20 +-
.../tools/partest/nest/ReflectiveRunner.scala | 9 +-
.../scala/tools/partest/nest/RunnerManager.scala | 8 +-
.../scala/tools/partest/nest/RunnerUtils.scala | 46 ++--
src/partest/scala/tools/partest/package.scala | 8 +-
.../scala/tools/partest/utils/PrintMgr.scala | 104 ++++-----
.../scala/reflect/internal/AnnotationInfos.scala | 11 +-
.../scala/reflect/internal/BuildUtils.scala | 2 -
.../reflect/internal/ClassfileConstants.scala | 12 +-
.../scala/reflect/internal/Definitions.scala | 137 ++++++------
.../reflect/internal/ExistentialsAndSkolems.scala | 1 -
src/reflect/scala/reflect/internal/Importers.scala | 2 +-
src/reflect/scala/reflect/internal/Names.scala | 64 +++---
src/reflect/scala/reflect/internal/Printers.scala | 4 +-
src/reflect/scala/reflect/internal/Scopes.scala | 2 +-
src/reflect/scala/reflect/internal/StdNames.scala | 242 ++++++++++-----------
.../scala/reflect/internal/SymbolTable.scala | 3 +-
src/reflect/scala/reflect/internal/Symbols.scala | 125 ++++++-----
src/reflect/scala/reflect/internal/TreeGen.scala | 12 +-
src/reflect/scala/reflect/internal/TreeInfo.scala | 58 ++---
src/reflect/scala/reflect/internal/Trees.scala | 2 +-
.../scala/reflect/internal/TypeDebugging.scala | 4 +-
src/reflect/scala/reflect/internal/Types.scala | 196 ++++++++---------
.../reflect/internal/pickling/PickleBuffer.scala | 2 +-
.../reflect/internal/pickling/PickleFormat.scala | 2 +-
.../reflect/internal/pickling/UnPickler.scala | 14 +-
.../scala/reflect/internal/util/Collections.scala | 54 ++---
.../scala/reflect/internal/util/HashSet.scala | 4 +-
.../scala/reflect/internal/util/Origins.scala | 2 -
.../scala/reflect/internal/util/Position.scala | 2 +-
.../scala/reflect/internal/util/SourceFile.scala | 9 +-
.../scala/reflect/internal/util/StringOps.scala | 46 ++--
.../scala/reflect/internal/util/TableDef.scala | 8 +-
.../internal/util/TraceSymbolActivity.scala | 4 +-
.../scala/reflect/internal/util/WeakHashSet.scala | 3 -
src/reflect/scala/reflect/io/AbstractFile.scala | 12 +-
src/reflect/scala/reflect/io/Directory.scala | 17 +-
src/reflect/scala/reflect/io/File.scala | 104 ++++-----
src/reflect/scala/reflect/io/Path.scala | 34 +--
src/reflect/scala/reflect/io/PlainFile.scala | 12 +-
src/reflect/scala/reflect/io/Streamable.scala | 10 +-
.../scala/reflect/io/VirtualDirectory.scala | 5 +-
src/reflect/scala/reflect/io/VirtualFile.scala | 4 +-
src/reflect/scala/reflect/io/ZipArchive.scala | 10 +-
src/reflect/scala/reflect/macros/TreeBuilder.scala | 1 -
.../scala/reflect/runtime/JavaMirrors.scala | 19 +-
.../scala/reflect/runtime/JavaUniverse.scala | 5 +-
.../reflect/runtime/SynchronizedSymbols.scala | 4 +-
src/reflect/scala/reflect/runtime/package.scala | 2 +-
193 files changed, 2581 insertions(+), 2662 deletions(-)
(limited to 'src')
diff --git a/src/compiler/scala/reflect/reify/Errors.scala b/src/compiler/scala/reflect/reify/Errors.scala
index a72233274e..9e59b40236 100644
--- a/src/compiler/scala/reflect/reify/Errors.scala
+++ b/src/compiler/scala/reflect/reify/Errors.scala
@@ -21,10 +21,10 @@ trait Errors {
throw new ReificationException(defaultErrorPosition, msg)
}
- def CannotReifySymbol(sym: Symbol) = {
- val msg = "implementation restriction: cannot reify symbol %s (%s)".format(sym, sym.accurateKindString)
- throw new ReificationException(defaultErrorPosition, msg)
- }
+ // def CannotReifySymbol(sym: Symbol) = {
+ // val msg = "implementation restriction: cannot reify symbol %s (%s)".format(sym, sym.accurateKindString)
+ // throw new ReificationException(defaultErrorPosition, msg)
+ // }
def CannotReifyWeakType(details: Any) = {
val msg = "cannot create a TypeTag" + details + ": use WeakTypeTag instead"
diff --git a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
index 6554947f88..d0f8ae76e2 100644
--- a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
+++ b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
@@ -91,20 +91,20 @@ trait GenUtils {
def termPath(fullname: String): Tree = path(fullname, newTermName)
/** An (unreified) path that refers to type definition with given fully qualified name */
- def typePath(fullname: String): Tree = path(fullname, newTypeName)
-
- def isTough(tpe: Type) = {
- def isTough(tpe: Type) = tpe match {
- case _: RefinedType => true
- case _: ExistentialType => true
- case _: ClassInfoType => true
- case _: MethodType => true
- case _: PolyType => true
- case _ => false
- }
+ // def typePath(fullname: String): Tree = path(fullname, newTypeName)
- tpe != null && (tpe exists isTough)
- }
+ // def isTough(tpe: Type) = {
+ // def isTough(tpe: Type) = tpe match {
+ // case _: RefinedType => true
+ // case _: ExistentialType => true
+ // case _: ClassInfoType => true
+ // case _: MethodType => true
+ // case _: PolyType => true
+ // case _ => false
+ // }
+
+ // tpe != null && (tpe exists isTough)
+ // }
object TypedOrAnnotated {
def unapply(tree: Tree): Option[Tree] = tree match {
@@ -117,14 +117,14 @@ trait GenUtils {
}
}
- def isAnnotated(tpe: Type) = {
- def isAnnotated(tpe: Type) = tpe match {
- case _: AnnotatedType => true
- case _ => false
- }
+ // def isAnnotated(tpe: Type) = {
+ // def isAnnotated(tpe: Type) = tpe match {
+ // case _: AnnotatedType => true
+ // case _ => false
+ // }
- tpe != null && (tpe exists isAnnotated)
- }
+ // tpe != null && (tpe exists isAnnotated)
+ // }
def isSemiConcreteTypeMember(tpe: Type) = tpe match {
case TypeRef(SingleType(_, _), sym, _) if sym.isAbstractType && !sym.isExistential => true
diff --git a/src/compiler/scala/reflect/reify/phases/Metalevels.scala b/src/compiler/scala/reflect/reify/phases/Metalevels.scala
index 92d951c3a1..cccf080dbf 100644
--- a/src/compiler/scala/reflect/reify/phases/Metalevels.scala
+++ b/src/compiler/scala/reflect/reify/phases/Metalevels.scala
@@ -1,6 +1,8 @@
package scala.reflect.reify
package phases
+import scala.collection.{ mutable }
+
trait Metalevels {
self: Reifier =>
@@ -101,7 +103,7 @@ trait Metalevels {
*/
val metalevels = new Transformer {
var insideSplice = false
- var inlineableBindings = scala.collection.mutable.Map[TermName, Tree]()
+ val inlineableBindings = mutable.Map[TermName, Tree]()
def withinSplice[T](op: => T) = {
val old = insideSplice
diff --git a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
index 99118c4f2e..6e34d64847 100644
--- a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
+++ b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
@@ -15,7 +15,7 @@ trait SymbolTables {
private[SymbolTable] val original: Option[List[Tree]] = None) {
def syms: List[Symbol] = symtab.keys.toList
- def isConcrete: Boolean = symtab.values forall (sym => !FreeTypeDef.unapply(sym).isDefined)
+ // def isConcrete: Boolean = symtab.values forall (sym => !FreeTypeDef.unapply(sym).isDefined)
// def aliases: Map[Symbol, List[TermName]] = aliases.distinct groupBy (_._1) mapValues (_ map (_._2))
diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala
index fde61e9564..d0fefdaa03 100644
--- a/src/compiler/scala/tools/ant/sabbus/Settings.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Settings.scala
@@ -10,7 +10,7 @@ package scala.tools.ant.sabbus
import java.io.File
-import org.apache.tools.ant.types.{Path, Reference}
+import org.apache.tools.ant.types.Path
class Settings {
diff --git a/src/compiler/scala/tools/cmd/FromString.scala b/src/compiler/scala/tools/cmd/FromString.scala
index 2a624875ee..c9df9f9145 100644
--- a/src/compiler/scala/tools/cmd/FromString.scala
+++ b/src/compiler/scala/tools/cmd/FromString.scala
@@ -25,17 +25,17 @@ abstract class FromString[+T](implicit t: ru.TypeTag[T]) extends PartialFunction
object FromString {
// We need these because we clash with the String => Path implicits.
- private def toFile(s: String) = new File(new java.io.File(s))
+ // private def toFile(s: String) = new File(new java.io.File(s))
private def toDir(s: String) = new Directory(new java.io.File(s))
/** Path related stringifiers.
*/
- val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
- override def isDefinedAt(s: String) = toFile(s).isFile
- def apply(s: String): File =
- if (isDefinedAt(s)) toFile(s)
- else cmd.runAndExit(println("'%s' is not an existing file." format s))
- }
+ // val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
+ // override def isDefinedAt(s: String) = toFile(s).isFile
+ // def apply(s: String): File =
+ // if (isDefinedAt(s)) toFile(s)
+ // else cmd.runAndExit(println("'%s' is not an existing file." format s))
+ // }
val ExistingDir: FromString[Directory] = new FromString[Directory]()(tagOfDirectory) {
override def isDefinedAt(s: String) = toDir(s).isDirectory
def apply(s: String): Directory =
diff --git a/src/compiler/scala/tools/cmd/Reference.scala b/src/compiler/scala/tools/cmd/Reference.scala
index d4f2060f81..4f1620d61a 100644
--- a/src/compiler/scala/tools/cmd/Reference.scala
+++ b/src/compiler/scala/tools/cmd/Reference.scala
@@ -26,7 +26,7 @@ trait Reference extends Spec {
def isUnaryOption(s: String) = unary contains toOpt(s)
def isBinaryOption(s: String) = binary contains toOpt(s)
def isExpandOption(s: String) = expansionMap contains toOpt(s)
- def isAnyOption(s: String) = isUnaryOption(s) || isBinaryOption(s) || isExpandOption(s)
+ // def isAnyOption(s: String) = isUnaryOption(s) || isBinaryOption(s) || isExpandOption(s)
def expandArg(arg: String) = expansionMap.getOrElse(fromOpt(arg), List(arg))
diff --git a/src/compiler/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala
index 5be819c134..6d523552b8 100644
--- a/src/compiler/scala/tools/nsc/CompilationUnits.scala
+++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala
@@ -26,7 +26,7 @@ trait CompilationUnits { self: Global =>
class CompilationUnit(val source: SourceFile) extends CompilationUnitContextApi {
/** the fresh name creator */
- var fresh: FreshNameCreator = new FreshNameCreator.Default
+ val fresh: FreshNameCreator = new FreshNameCreator.Default
def freshTermName(prefix: String): TermName = newTermName(fresh.newName(prefix))
def freshTypeName(prefix: String): TypeName = newTypeName(fresh.newName(prefix))
@@ -108,16 +108,16 @@ trait CompilationUnits { self: Global =>
override def toString() = source.toString()
- def clear() {
- fresh = new FreshNameCreator.Default
- body = EmptyTree
- depends.clear()
- defined.clear()
- synthetics.clear()
- toCheck.clear()
- checkedFeatures = Set()
- icode.clear()
- }
+ // def clear() {
+ // fresh = new FreshNameCreator.Default
+ // body = EmptyTree
+ // depends.clear()
+ // defined.clear()
+ // synthetics.clear()
+ // toCheck.clear()
+ // checkedFeatures = Set()
+ // icode.clear()
+ // }
}
}
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index 521f788fa1..11ee34af99 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -29,7 +29,7 @@ class StandardCompileServer extends SocketServer {
var shutdown = false
var verbose = false
- val versionMsg = "Fast " + Properties.versionMsg
+ // val versionMsg = "Fast " + Properties.versionMsg
val MaxCharge = 0.8
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index 829e097714..577d28f5f6 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -15,7 +15,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
type Setting = Settings#Setting
/** file extensions of files that the compiler can process */
- lazy val fileEndings = Properties.fileEndings
+ // lazy val fileEndings = Properties.fileEndings
private val processArgumentsResult =
if (shouldProcessArguments) processArguments
@@ -40,8 +40,8 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
""".stripMargin.trim + "\n"
def shortUsage = "Usage: %s
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
abstract class AbstractFile extends Iterable[AbstractFile] {
@@ -195,9 +195,9 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
* @param directory ...
* @return ...
*/
- def lookupPath(path: String, directory: Boolean): AbstractFile = {
- lookup((f, p, dir) => f.lookupName(p, dir), path, directory)
- }
+ // def lookupPath(path: String, directory: Boolean): AbstractFile = {
+ // lookup((f, p, dir) => f.lookupName(p, dir), path, directory)
+ // }
/** Return an abstract file that does not check that `path` denotes
* an existing file.
diff --git a/src/reflect/scala/reflect/io/Directory.scala b/src/reflect/scala/reflect/io/Directory.scala
index c040d1eac5..3a21509457 100644
--- a/src/reflect/scala/reflect/io/Directory.scala
+++ b/src/reflect/scala/reflect/io/Directory.scala
@@ -14,12 +14,12 @@ import java.io.{ File => JFile }
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
object Directory {
- import scala.util.Properties.{ tmpDir, userHome, userDir }
+ import scala.util.Properties.{ userHome, userDir }
private def normalizePath(s: String) = Some(apply(Path(s).normalize))
def Current: Option[Directory] = if (userDir == "") None else normalizePath(userDir)
- def Home: Option[Directory] = if (userHome == "") None else normalizePath(userHome)
- def TmpDir: Option[Directory] = if (tmpDir == "") None else normalizePath(tmpDir)
+ // def Home: Option[Directory] = if (userHome == "") None else normalizePath(userHome)
+ // def TmpDir: Option[Directory] = if (tmpDir == "") None else normalizePath(tmpDir)
def apply(path: Path): Directory = path.toDirectory
@@ -30,20 +30,19 @@ object Directory {
path.createDirectory()
}
}
-import Path._
/** An abstraction for directories.
*
* @author Paul Phillips
* @since 2.8
- *
+ *
* ''Note: This is library is considered experimental and should not be used unless you know what you are doing.''
*/
class Directory(jfile: JFile) extends Path(jfile) {
override def toAbsolute: Directory = if (isAbsolute) this else super.toAbsolute.toDirectory
override def toDirectory: Directory = this
override def toFile: File = new File(jfile)
- override def isValid = jfile.isDirectory() || !jfile.exists()
+ // override def isValid = jfile.isDirectory() || !jfile.exists()
override def normalize: Directory = super.normalize.toDirectory
/** An iterator over the contents of this directory.
@@ -60,7 +59,7 @@ class Directory(jfile: JFile) extends Path(jfile) {
override def walkFilter(cond: Path => Boolean): Iterator[Path] =
list filter cond flatMap (_ walkFilter cond)
- def deepDirs: Iterator[Directory] = Path.onlyDirs(deepList())
+ // def deepDirs: Iterator[Directory] = Path.onlyDirs(deepList())
def deepFiles: Iterator[File] = Path.onlyFiles(deepList())
/** If optional depth argument is not given, will recurse
@@ -74,6 +73,6 @@ class Directory(jfile: JFile) extends Path(jfile) {
/** An iterator over the directories underneath this directory,
* to the (optionally) given depth.
*/
- def subdirs(depth: Int = 1): Iterator[Directory] =
- deepList(depth) collect { case x: Directory => x }
+ // def subdirs(depth: Int = 1): Iterator[Directory] =
+ // deepList(depth) collect { case x: Directory => x }
}
diff --git a/src/reflect/scala/reflect/io/File.scala b/src/reflect/scala/reflect/io/File.scala
index 736ba5d51e..04e122af67 100644
--- a/src/reflect/scala/reflect/io/File.scala
+++ b/src/reflect/scala/reflect/io/File.scala
@@ -35,12 +35,12 @@ object File {
type HasClose = { def close(): Unit }
- def closeQuietly(target: HasClose) {
- try target.close() catch { case e: IOException => }
- }
- def closeQuietly(target: JCloseable) {
- try target.close() catch { case e: IOException => }
- }
+ // def closeQuietly(target: HasClose) {
+ // try target.close() catch { case e: IOException => }
+ // }
+ // def closeQuietly(target: JCloseable) {
+ // try target.close() catch { case e: IOException => }
+ // }
// this is a workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6503430
// we are using a static initializer to statically initialize a java class so we don't
@@ -65,8 +65,8 @@ object File {
// case _: IllegalArgumentException | _: IllegalStateException | _: IOException | _: SecurityException => ()
// }
}
-import File._
-import Path._
+// import File._
+// import Path._
/** An abstraction for files. For character data, a Codec
* can be supplied at either creation time or when a method
@@ -76,19 +76,19 @@ import Path._
*
* @author Paul Phillips
* @since 2.8
- *
+ *
* ''Note: This is library is considered experimental and should not be used unless you know what you are doing.''
*/
class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) with Streamable.Chars {
override val creationCodec = constructorCodec
- def withCodec(codec: Codec): File = new File(jfile)(codec)
+ // def withCodec(codec: Codec): File = new File(jfile)(codec)
override def addExtension(ext: String): File = super.addExtension(ext).toFile
override def toAbsolute: File = if (isAbsolute) this else super.toAbsolute.toFile
override def toDirectory: Directory = new Directory(jfile)
override def toFile: File = this
override def normalize: File = super.normalize.toFile
- override def isValid = jfile.isFile() || !jfile.exists()
+ // override def isValid = jfile.isFile() || !jfile.exists()
override def length = super[Path].length
override def walkFilter(cond: Path => Boolean): Iterator[Path] =
if (cond(this)) Iterator.single(this) else Iterator.empty
@@ -99,14 +99,14 @@ class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) w
/** Obtains a OutputStream. */
def outputStream(append: Boolean = false) = new FileOutputStream(jfile, append)
def bufferedOutput(append: Boolean = false) = new BufferedOutputStream(outputStream(append))
- def printStream(append: Boolean = false) = new PrintStream(outputStream(append), true)
+ // def printStream(append: Boolean = false) = new PrintStream(outputStream(append), true)
/** Obtains an OutputStreamWriter wrapped around a FileOutputStream.
* This should behave like a less broken version of java.io.FileWriter,
* in that unlike the java version you can specify the encoding.
*/
- def writer(): OutputStreamWriter = writer(false)
- def writer(append: Boolean): OutputStreamWriter = writer(append, creationCodec)
+ // def writer(): OutputStreamWriter = writer(false)
+ // def writer(append: Boolean): OutputStreamWriter = writer(append, creationCodec)
def writer(append: Boolean, codec: Codec): OutputStreamWriter =
new OutputStreamWriter(outputStream(append), codec.charSet)
@@ -118,7 +118,7 @@ class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) w
new BufferedWriter(writer(append, codec))
def printWriter(): PrintWriter = new PrintWriter(bufferedWriter(), true)
- def printWriter(append: Boolean): PrintWriter = new PrintWriter(bufferedWriter(append), true)
+ // def printWriter(append: Boolean): PrintWriter = new PrintWriter(bufferedWriter(append), true)
/** Creates a new file and writes all the Strings to it. */
def writeAll(strings: String*): Unit = {
@@ -127,11 +127,11 @@ class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) w
finally out.close()
}
- def writeBytes(bytes: Array[Byte]): Unit = {
- val out = bufferedOutput()
- try out write bytes
- finally out.close()
- }
+ // def writeBytes(bytes: Array[Byte]): Unit = {
+ // val out = bufferedOutput()
+ // try out write bytes
+ // finally out.close()
+ // }
def appendAll(strings: String*): Unit = {
val out = bufferedWriter(append = true)
@@ -150,38 +150,38 @@ class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) w
try Some(slurp())
catch { case _: IOException => None }
- def copyTo(destPath: Path, preserveFileDate: Boolean = false): Boolean = {
- val CHUNK = 1024 * 1024 * 16 // 16 MB
- val dest = destPath.toFile
- if (!isValid) fail("Source %s is not a valid file." format name)
- if (this.normalize == dest.normalize) fail("Source and destination are the same.")
- if (!dest.parent.exists) fail("Destination cannot be created.")
- if (dest.exists && !dest.canWrite) fail("Destination exists but is not writable.")
- if (dest.isDirectory) fail("Destination exists but is a directory.")
-
- lazy val in_s = inputStream()
- lazy val out_s = dest.outputStream()
- lazy val in = in_s.getChannel()
- lazy val out = out_s.getChannel()
-
- try {
- val size = in.size()
- var pos, count = 0L
- while (pos < size) {
- count = (size - pos) min CHUNK
- pos += out.transferFrom(in, pos, count)
- }
- }
- finally List[HasClose](out, out_s, in, in_s) foreach closeQuietly
-
- if (this.length != dest.length)
- fail("Failed to completely copy %s to %s".format(name, dest.name))
-
- if (preserveFileDate)
- dest.lastModified = this.lastModified
-
- true
- }
+ // def copyTo(destPath: Path, preserveFileDate: Boolean = false): Boolean = {
+ // val CHUNK = 1024 * 1024 * 16 // 16 MB
+ // val dest = destPath.toFile
+ // if (!isValid) fail("Source %s is not a valid file." format name)
+ // if (this.normalize == dest.normalize) fail("Source and destination are the same.")
+ // if (!dest.parent.exists) fail("Destination cannot be created.")
+ // if (dest.exists && !dest.canWrite) fail("Destination exists but is not writable.")
+ // if (dest.isDirectory) fail("Destination exists but is a directory.")
+
+ // lazy val in_s = inputStream()
+ // lazy val out_s = dest.outputStream()
+ // lazy val in = in_s.getChannel()
+ // lazy val out = out_s.getChannel()
+
+ // try {
+ // val size = in.size()
+ // var pos, count = 0L
+ // while (pos < size) {
+ // count = (size - pos) min CHUNK
+ // pos += out.transferFrom(in, pos, count)
+ // }
+ // }
+ // finally List[HasClose](out, out_s, in, in_s) foreach closeQuietly
+
+ // if (this.length != dest.length)
+ // fail("Failed to completely copy %s to %s".format(name, dest.name))
+
+ // if (preserveFileDate)
+ // dest.lastModified = this.lastModified
+
+ // true
+ // }
/** Reflection since we're into the java 6+ API.
*/
diff --git a/src/reflect/scala/reflect/io/Path.scala b/src/reflect/scala/reflect/io/Path.scala
index 36fdc04db4..77b5065db1 100644
--- a/src/reflect/scala/reflect/io/Path.scala
+++ b/src/reflect/scala/reflect/io/Path.scala
@@ -27,7 +27,7 @@ import scala.language.implicitConversions
*
* @author Paul Phillips
* @since 2.8
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
object Path {
@@ -65,11 +65,11 @@ object Path {
def onlyDirs(xs: Iterator[Path]): Iterator[Directory] = xs filter (_.isDirectory) map (_.toDirectory)
def onlyDirs(xs: List[Path]): List[Directory] = xs filter (_.isDirectory) map (_.toDirectory)
def onlyFiles(xs: Iterator[Path]): Iterator[File] = xs filter (_.isFile) map (_.toFile)
- def onlyFiles(xs: List[Path]): List[File] = xs filter (_.isFile) map (_.toFile)
+ // def onlyFiles(xs: List[Path]): List[File] = xs filter (_.isFile) map (_.toFile)
def roots: List[Path] = java.io.File.listRoots().toList map Path.apply
- def apply(segments: Seq[String]): Path = apply(segments mkString java.io.File.separator)
+ // def apply(segments: Seq[String]): Path = apply(segments mkString java.io.File.separator)
def apply(path: String): Path = apply(new JFile(path))
def apply(jfile: JFile): Path =
if (jfile.isFile) new File(jfile)
@@ -84,7 +84,7 @@ import Path._
/** The Path constructor is private so we can enforce some
* semantics regarding how a Path might relate to the world.
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
class Path private[io] (val jfile: JFile) {
@@ -95,7 +95,7 @@ class Path private[io] (val jfile: JFile) {
// contents of the filesystem are in agreement. All objects are
// valid except File objects whose path points to a directory and
// Directory objects whose path points to a file.
- def isValid: Boolean = true
+ // def isValid: Boolean = true
// conversions
def toFile: File = new File(jfile)
@@ -136,7 +136,7 @@ class Path private[io] (val jfile: JFile) {
def name: String = jfile.getName()
def path: String = jfile.getPath()
def normalize: Path = Path(jfile.getAbsolutePath())
- def isRootPath: Boolean = roots exists (_ isSame this)
+ // def isRootPath: Boolean = roots exists (_ isSame this)
def resolve(other: Path) = if (other.isAbsolute || isEmpty) other else /(other)
def relativize(other: Path) = {
@@ -153,7 +153,7 @@ class Path private[io] (val jfile: JFile) {
}
// derived from identity
- def root: Option[Path] = roots find (this startsWith _)
+ // def root: Option[Path] = roots find (this startsWith _)
def segments: List[String] = (path split separator).toList filterNot (_.length == 0)
/**
* @return The path of the parent directory, or root if path is already root
@@ -213,22 +213,22 @@ class Path private[io] (val jfile: JFile) {
def canRead = jfile.canRead()
def canWrite = jfile.canWrite()
def exists = jfile.exists()
- def notExists = try !jfile.exists() catch { case ex: SecurityException => false }
+ // def notExists = try !jfile.exists() catch { case ex: SecurityException => false }
def isFile = jfile.isFile()
def isDirectory = jfile.isDirectory()
def isAbsolute = jfile.isAbsolute()
- def isHidden = jfile.isHidden()
+ // def isHidden = jfile.isHidden()
def isEmpty = path.length == 0
// Information
def lastModified = jfile.lastModified()
- def lastModified_=(time: Long) = jfile setLastModified time // should use setXXX function?
+ // def lastModified_=(time: Long) = jfile setLastModified time // should use setXXX function?
def length = jfile.length()
// Boolean path comparisons
def endsWith(other: Path) = segments endsWith other.segments
- def startsWith(other: Path) = segments startsWith other.segments
+ // def startsWith(other: Path) = segments startsWith other.segments
def isSame(other: Path) = toCanonical == other.toCanonical
def isFresher(other: Path) = lastModified > other.lastModified
@@ -248,7 +248,7 @@ class Path private[io] (val jfile: JFile) {
// deletions
def delete() = jfile.delete()
- def deleteIfExists() = if (jfile.exists()) delete() else false
+ // def deleteIfExists() = if (jfile.exists()) delete() else false
/** Deletes the path recursively. Returns false on failure.
* Use with caution!
@@ -270,11 +270,11 @@ class Path private[io] (val jfile: JFile) {
length == 0
}
- def touch(modTime: Long = System.currentTimeMillis) = {
- createFile()
- if (isFile)
- lastModified = modTime
- }
+ // def touch(modTime: Long = System.currentTimeMillis) = {
+ // createFile()
+ // if (isFile)
+ // lastModified = modTime
+ // }
// todo
// def copyTo(target: Path, options ...): Boolean
diff --git a/src/reflect/scala/reflect/io/PlainFile.scala b/src/reflect/scala/reflect/io/PlainFile.scala
index 82b0568657..6ee51d3d37 100644
--- a/src/reflect/scala/reflect/io/PlainFile.scala
+++ b/src/reflect/scala/reflect/io/PlainFile.scala
@@ -8,17 +8,17 @@ package scala.reflect
package io
import java.io.{ FileInputStream, FileOutputStream, IOException }
-import PartialFunction._
+
/** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */
object PlainFile {
/**
* If the specified File exists, returns an abstract file backed
* by it. Otherwise, returns null.
*/
- def fromPath(file: Path): PlainFile =
- if (file.isDirectory) new PlainDirectory(file.toDirectory)
- else if (file.isFile) new PlainFile(file)
- else null
+ // def fromPath(file: Path): PlainFile =
+ // if (file.isDirectory) new PlainDirectory(file.toDirectory)
+ // else if (file.isFile) new PlainFile(file)
+ // else null
}
/** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */
class PlainDirectory(givenPath: Directory) extends PlainFile(givenPath) {
@@ -28,7 +28,7 @@ class PlainDirectory(givenPath: Directory) extends PlainFile(givenPath) {
}
/** This class implements an abstract file backed by a File.
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
class PlainFile(val givenPath: Path) extends AbstractFile {
diff --git a/src/reflect/scala/reflect/io/Streamable.scala b/src/reflect/scala/reflect/io/Streamable.scala
index 61ec8a4c23..615f44acc5 100644
--- a/src/reflect/scala/reflect/io/Streamable.scala
+++ b/src/reflect/scala/reflect/io/Streamable.scala
@@ -17,14 +17,14 @@ import Path.fail
*
* @author Paul Phillips
* @since 2.8
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
object Streamable {
/** Traits which can be viewed as a sequence of bytes. Source types
* which know their length should override def length: Long for more
* efficient method implementations.
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
trait Bytes {
@@ -69,7 +69,7 @@ object Streamable {
}
/** For objects which can be viewed as Chars.
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
trait Chars extends Bytes {
@@ -81,7 +81,7 @@ object Streamable {
*/
def creationCodec: Codec = implicitly[Codec]
- def chars(): BufferedSource = chars(creationCodec)
+ // def chars(): BufferedSource = chars(creationCodec)
def chars(codec: Codec): BufferedSource = Source.fromInputStream(inputStream())(codec)
def lines(): Iterator[String] = lines(creationCodec)
@@ -89,7 +89,7 @@ object Streamable {
/** Obtains an InputStreamReader wrapped around a FileInputStream.
*/
- def reader(): InputStreamReader = reader(creationCodec)
+ // def reader(): InputStreamReader = reader(creationCodec)
def reader(codec: Codec): InputStreamReader = new InputStreamReader(inputStream, codec.charSet)
/** Wraps a BufferedReader around the result of reader().
diff --git a/src/reflect/scala/reflect/io/VirtualDirectory.scala b/src/reflect/scala/reflect/io/VirtualDirectory.scala
index 78713c2ae0..72ffff2aa9 100644
--- a/src/reflect/scala/reflect/io/VirtualDirectory.scala
+++ b/src/reflect/scala/reflect/io/VirtualDirectory.scala
@@ -11,7 +11,7 @@ import scala.collection.mutable
* An in-memory directory.
*
* @author Lex Spoon
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
class VirtualDirectory(val name: String, maybeContainer: Option[VirtualDirectory])
@@ -26,7 +26,8 @@ extends AbstractFile {
def container = maybeContainer.get
def isDirectory = true
- var lastModified: Long = System.currentTimeMillis
+ val lastModified: Long = System.currentTimeMillis
+ // var lastModified: Long = System.currentTimeMillis
override def file = null
override def input = sys.error("directories cannot be read")
diff --git a/src/reflect/scala/reflect/io/VirtualFile.scala b/src/reflect/scala/reflect/io/VirtualFile.scala
index 95f4429fad..014e02c6cd 100644
--- a/src/reflect/scala/reflect/io/VirtualFile.scala
+++ b/src/reflect/scala/reflect/io/VirtualFile.scala
@@ -14,7 +14,7 @@ import java.io.{ File => JFile }
*
* @author Philippe Altherr
* @version 1.0, 23/03/2004
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
class VirtualFile(val name: String, override val path: String) extends AbstractFile {
@@ -65,7 +65,7 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF
/** Returns the time that this abstract file was last modified. */
private var _lastModified: Long = 0
def lastModified: Long = _lastModified
- def lastModified_=(x: Long) = _lastModified = x
+ // def lastModified_=(x: Long) = _lastModified = x
/** Returns all abstract subfiles of this abstract directory. */
def iterator: Iterator[AbstractFile] = {
diff --git a/src/reflect/scala/reflect/io/ZipArchive.scala b/src/reflect/scala/reflect/io/ZipArchive.scala
index 3b57721e89..0e69834d26 100644
--- a/src/reflect/scala/reflect/io/ZipArchive.scala
+++ b/src/reflect/scala/reflect/io/ZipArchive.scala
@@ -20,12 +20,12 @@ import scala.annotation.tailrec
* @author Philippe Altherr (original version)
* @author Paul Phillips (this one)
* @version 2.0,
- *
+ *
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
object ZipArchive {
- def fromPath(path: String): FileZipArchive = fromFile(new JFile(path))
- def fromPath(path: Path): FileZipArchive = fromFile(path.toFile)
+ // def fromPath(path: String): FileZipArchive = fromFile(new JFile(path))
+ // def fromPath(path: Path): FileZipArchive = fromFile(path.toFile)
/**
* @param file a File
@@ -41,7 +41,7 @@ object ZipArchive {
* @return A ZipArchive backed by the given url.
*/
def fromURL(url: URL): URLZipArchive = new URLZipArchive(url)
- def fromURL(url: String): URLZipArchive = fromURL(new URL(url))
+ // def fromURL(url: String): URLZipArchive = fromURL(new URL(url))
private def dirName(path: String) = splitPath(path, true)
private def baseName(path: String) = splitPath(path, false)
@@ -79,7 +79,7 @@ abstract class ZipArchive(override val file: JFile) extends AbstractFile with Eq
else Iterator(f)
}
}
- def deepIterator = walkIterator(iterator)
+ // def deepIterator = walkIterator(iterator)
/** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */
sealed abstract class Entry(path: String) extends VirtualFile(baseName(path), path) {
// have to keep this name for compat with sbt's compiler-interface
diff --git a/src/reflect/scala/reflect/macros/TreeBuilder.scala b/src/reflect/scala/reflect/macros/TreeBuilder.scala
index 204dc40858..fbbbe13201 100644
--- a/src/reflect/scala/reflect/macros/TreeBuilder.scala
+++ b/src/reflect/scala/reflect/macros/TreeBuilder.scala
@@ -11,7 +11,6 @@ abstract class TreeBuilder {
val global: Universe
import global._
- import definitions._
/** Builds a reference to value whose type is given stable prefix.
* The type must be suitable for this. For example, it
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 44fbd55162..07599e095d 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -22,7 +22,6 @@ import internal.Flags._
import ReflectionUtils.{staticSingletonInstance, innerSingletonInstance}
import scala.language.existentials
import scala.runtime.{ScalaRunTime, BoxesRunTime}
-import scala.reflect.internal.util.Collections._
private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { thisUniverse: SymbolTable =>
@@ -841,13 +840,13 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
* @return A Scala field object that corresponds to `jfield`.
* // ??? should we return the getter instead?
*/
- def fieldToScala(jfield: jField): TermSymbol =
- toScala(fieldCache, jfield)(_ fieldToScala1 _)
+ // def fieldToScala(jfield: jField): TermSymbol =
+ // toScala(fieldCache, jfield)(_ fieldToScala1 _)
- private def fieldToScala1(jfield: jField): TermSymbol = {
- val owner = followStatic(classToScala(jfield.getDeclaringClass), jfield.getModifiers)
- (lookup(owner, jfield.getName) suchThat (!_.isMethod) orElse jfieldAsScala(jfield)).asTerm
- }
+ // private def fieldToScala1(jfield: jField): TermSymbol = {
+ // val owner = followStatic(classToScala(jfield.getDeclaringClass), jfield.getModifiers)
+ // (lookup(owner, jfield.getName) suchThat (!_.isMethod) orElse jfieldAsScala(jfield)).asTerm
+ // }
/**
* The Scala package corresponding to given Java package
@@ -1115,9 +1114,9 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
/** Optionally, the Java package corresponding to a given Scala package, or None if no such Java package exists.
* @param pkg The Scala package
*/
- def packageToJavaOption(pkg: ModuleSymbol): Option[jPackage] = packageCache.toJavaOption(pkg) {
- Option(jPackage.getPackage(pkg.fullName.toString))
- }
+ // def packageToJavaOption(pkg: ModuleSymbol): Option[jPackage] = packageCache.toJavaOption(pkg) {
+ // Option(jPackage.getPackage(pkg.fullName.toString))
+ // }
/** The Java class corresponding to given Scala class.
* Note: This only works for
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverse.scala b/src/reflect/scala/reflect/runtime/JavaUniverse.scala
index 0f70a676fa..a12e7d43d4 100644
--- a/src/reflect/scala/reflect/runtime/JavaUniverse.scala
+++ b/src/reflect/scala/reflect/runtime/JavaUniverse.scala
@@ -1,8 +1,6 @@
package scala.reflect
package runtime
-import internal.{SomePhase, NoPhase, Phase, TreeGen}
-
/** An implementation of [[scala.reflect.api.Universe]] for runtime reflection using JVM classloaders.
*
* Should not be instantiated directly, use [[scala.reflect.runtime.universe]] instead.
@@ -11,7 +9,7 @@ import internal.{SomePhase, NoPhase, Phase, TreeGen}
*/
class JavaUniverse extends internal.SymbolTable with ReflectSetup with runtime.SymbolTable { self =>
- def picklerPhase = SomePhase
+ def picklerPhase = internal.SomePhase
def forInteractive = false
def forScaladoc = false
@@ -26,4 +24,3 @@ class JavaUniverse extends internal.SymbolTable with ReflectSetup with runtime.S
init()
}
-
diff --git a/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala b/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala
index 366b4319c3..b415abecb1 100644
--- a/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala
+++ b/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala
@@ -83,8 +83,8 @@ private[reflect] trait SynchronizedSymbols extends internal.Symbols { self: Symb
override protected def createPackageObjectClassSymbol(pos: Position, newFlags: Long): PackageObjectClassSymbol =
new PackageObjectClassSymbol(this, pos) with SynchronizedClassSymbol initFlags newFlags
- override protected def createTermSymbol(name: TermName, pos: Position, newFlags: Long): TermSymbol =
- new TermSymbol(this, pos, name) with SynchronizedTermSymbol initFlags newFlags
+ // override protected def createTermSymbol(name: TermName, pos: Position, newFlags: Long): TermSymbol =
+ // new TermSymbol(this, pos, name) with SynchronizedTermSymbol initFlags newFlags
override protected def createMethodSymbol(name: TermName, pos: Position, newFlags: Long): MethodSymbol =
new MethodSymbol(this, pos, name) with SynchronizedMethodSymbol initFlags newFlags
diff --git a/src/reflect/scala/reflect/runtime/package.scala b/src/reflect/scala/reflect/runtime/package.scala
index b97913daf0..eadbc0c52e 100644
--- a/src/reflect/scala/reflect/runtime/package.scala
+++ b/src/reflect/scala/reflect/runtime/package.scala
@@ -6,7 +6,7 @@ package scala.reflect
package object runtime {
/** The entry point into Scala runtime reflection.
- *
+ *
* To use Scala runtime reflection, simply use or import `scala.reflect.runtime.universe._`
*
* See [[scala.reflect.api.Universe]] or the
--
cgit v1.2.3
From d5e3f85946af966111f88af90a666a709df0ba6f Mon Sep 17 00:00:00 2001
From: Paul Phillips
Date: Tue, 13 Nov 2012 00:14:40 -0800
Subject: Revert "Commenting out unused members."
This reverts commit 951fc3a486.
---
src/compiler/scala/reflect/reify/Errors.scala | 8 +-
.../scala/reflect/reify/codegen/GenUtils.scala | 40 ++--
.../scala/reflect/reify/phases/Metalevels.scala | 4 +-
.../scala/reflect/reify/utils/SymbolTables.scala | 2 +-
src/compiler/scala/tools/ant/sabbus/Settings.scala | 2 +-
src/compiler/scala/tools/cmd/FromString.scala | 14 +-
src/compiler/scala/tools/cmd/Reference.scala | 2 +-
.../scala/tools/nsc/CompilationUnits.scala | 22 +-
src/compiler/scala/tools/nsc/CompileServer.scala | 2 +-
src/compiler/scala/tools/nsc/CompilerCommand.scala | 6 +-
src/compiler/scala/tools/nsc/CompilerRun.scala | 36 +--
src/compiler/scala/tools/nsc/Global.scala | 107 ++++-----
src/compiler/scala/tools/nsc/ObjectRunner.scala | 4 +-
src/compiler/scala/tools/nsc/Phases.scala | 4 +-
src/compiler/scala/tools/nsc/Properties.scala | 2 +-
src/compiler/scala/tools/nsc/ScriptRunner.scala | 2 +-
src/compiler/scala/tools/nsc/ast/DocComments.scala | 8 +-
src/compiler/scala/tools/nsc/ast/Printers.scala | 82 ++++++-
src/compiler/scala/tools/nsc/ast/TreeDSL.scala | 76 +++----
src/compiler/scala/tools/nsc/ast/TreeGen.scala | 170 +++++++--------
src/compiler/scala/tools/nsc/ast/TreeInfo.scala | 6 +-
.../scala/tools/nsc/ast/parser/Parsers.scala | 25 +--
.../scala/tools/nsc/ast/parser/Scanners.scala | 59 +++--
.../scala/tools/nsc/ast/parser/Tokens.scala | 62 +++---
.../scala/tools/nsc/ast/parser/TreeBuilder.scala | 26 +--
.../tools/nsc/backend/icode/BasicBlocks.scala | 36 +--
.../nsc/backend/icode/ExceptionHandlers.scala | 10 +-
.../scala/tools/nsc/backend/icode/GenICode.scala | 28 +--
.../scala/tools/nsc/backend/icode/Members.scala | 50 ++---
.../scala/tools/nsc/backend/icode/Opcodes.scala | 20 +-
.../scala/tools/nsc/backend/icode/Primitives.scala | 16 +-
.../scala/tools/nsc/backend/icode/Repository.scala | 14 +-
.../scala/tools/nsc/backend/icode/TypeKinds.scala | 4 +-
.../scala/tools/nsc/backend/icode/TypeStacks.scala | 6 +-
.../backend/icode/analysis/CopyPropagation.scala | 20 +-
.../backend/icode/analysis/DataFlowAnalysis.scala | 10 +-
.../backend/icode/analysis/TypeFlowAnalysis.scala | 62 +++---
.../scala/tools/nsc/backend/jvm/GenASM.scala | 12 +-
.../scala/tools/nsc/backend/jvm/GenJVM.scala | 26 +--
.../scala/tools/nsc/backend/msil/GenMSIL.scala | 12 +-
.../tools/nsc/backend/opt/ClosureElimination.scala | 4 +-
.../scala/tools/nsc/backend/opt/Inliners.scala | 6 +-
src/compiler/scala/tools/nsc/doc/html/Page.scala | 6 +-
.../scala/tools/nsc/doc/model/Entity.scala | 14 +-
.../tools/nsc/doc/model/IndexModelFactory.scala | 2 +-
.../scala/tools/nsc/doc/model/ModelFactory.scala | 48 ++--
.../doc/model/ModelFactoryImplicitSupport.scala | 32 +--
.../tools/nsc/doc/model/comment/Comment.scala | 2 +-
.../nsc/doc/model/comment/CommentFactory.scala | 36 +--
.../tools/nsc/doc/model/diagram/Diagram.scala | 18 +-
.../scala/tools/nsc/interactive/BuildManager.scala | 2 +-
.../scala/tools/nsc/interactive/Global.scala | 68 +++---
.../scala/tools/nsc/interpreter/ByteCode.scala | 28 +--
.../scala/tools/nsc/interpreter/CodeHandlers.scala | 100 ++++-----
.../scala/tools/nsc/interpreter/CommandLine.scala | 2 +-
.../scala/tools/nsc/interpreter/Completion.scala | 2 +-
.../tools/nsc/interpreter/CompletionAware.scala | 46 ++--
.../tools/nsc/interpreter/CompletionOutput.scala | 2 +-
.../nsc/interpreter/ConsoleReaderHelper.scala | 10 +-
.../scala/tools/nsc/interpreter/Delimited.scala | 6 +-
.../scala/tools/nsc/interpreter/ExprTyper.scala | 9 +-
.../scala/tools/nsc/interpreter/ILoop.scala | 55 ++---
.../scala/tools/nsc/interpreter/IMain.scala | 199 +++++++++--------
.../scala/tools/nsc/interpreter/ISettings.scala | 10 +-
.../scala/tools/nsc/interpreter/Imports.scala | 22 +-
.../tools/nsc/interpreter/InteractiveReader.scala | 12 +-
.../tools/nsc/interpreter/JLineCompletion.scala | 12 +-
.../scala/tools/nsc/interpreter/JLineReader.scala | 8 +-
.../scala/tools/nsc/interpreter/Logger.scala | 6 +-
.../scala/tools/nsc/interpreter/LoopCommands.scala | 38 ++--
.../tools/nsc/interpreter/MemberHandlers.scala | 26 +--
.../scala/tools/nsc/interpreter/NamedParam.scala | 6 +-
.../scala/tools/nsc/interpreter/Naming.scala | 2 +-
.../scala/tools/nsc/interpreter/Parsed.scala | 14 +-
.../scala/tools/nsc/interpreter/Phased.scala | 30 +--
.../scala/tools/nsc/interpreter/Power.scala | 152 ++++++-------
.../scala/tools/nsc/interpreter/ReplConfig.scala | 24 +-
.../scala/tools/nsc/interpreter/ReplProps.scala | 6 +-
.../scala/tools/nsc/interpreter/ReplStrings.scala | 2 +-
.../scala/tools/nsc/interpreter/RichClass.scala | 7 +-
.../scala/tools/nsc/interpreter/SimpleReader.scala | 8 +-
.../scala/tools/nsc/interpreter/TypeStrings.scala | 18 +-
.../scala/tools/nsc/interpreter/package.scala | 54 ++---
.../tools/nsc/interpreter/session/History.scala | 10 +-
.../nsc/interpreter/session/SimpleHistory.scala | 6 +-
src/compiler/scala/tools/nsc/io/Fileish.scala | 52 ++---
src/compiler/scala/tools/nsc/io/Jar.scala | 24 +-
src/compiler/scala/tools/nsc/io/MsilFile.scala | 2 +-
src/compiler/scala/tools/nsc/io/Pickler.scala | 74 +++----
src/compiler/scala/tools/nsc/io/Socket.scala | 8 +-
src/compiler/scala/tools/nsc/io/SourceReader.scala | 2 +-
src/compiler/scala/tools/nsc/io/package.scala | 22 +-
.../scala/tools/nsc/javac/JavaParsers.scala | 8 +-
.../scala/tools/nsc/javac/JavaScanners.scala | 48 ++--
.../scala/tools/nsc/javac/JavaTokens.scala | 12 +-
.../scala/tools/nsc/matching/MatchSupport.scala | 38 ++--
src/compiler/scala/tools/nsc/matching/Matrix.scala | 48 ++--
.../tools/nsc/matching/ParallelMatching.scala | 6 +-
.../scala/tools/nsc/matching/PatternBindings.scala | 2 +-
.../scala/tools/nsc/matching/Patterns.scala | 48 ++--
.../scala/tools/nsc/settings/AbsSettings.scala | 16 +-
.../tools/nsc/settings/AdvancedScalaSettings.scala | 148 ++++++-------
.../scala/tools/nsc/settings/MutableSettings.scala | 10 +-
.../scala/tools/nsc/settings/ScalaSettings.scala | 10 +-
.../tools/nsc/settings/StandardScalaSettings.scala | 2 +-
.../scala/tools/nsc/settings/Warnings.scala | 14 +-
.../nsc/symtab/classfile/AbstractFileReader.scala | 12 +-
.../nsc/symtab/classfile/ClassfileParser.scala | 20 +-
.../tools/nsc/symtab/classfile/ICodeReader.scala | 6 +-
.../scala/tools/nsc/symtab/classfile/Pickler.scala | 208 +++++++++---------
.../tools/nsc/transform/SpecializeTypes.scala | 28 +--
.../scala/tools/nsc/transform/TailCalls.scala | 2 +-
.../tools/nsc/transform/TypingTransformers.scala | 2 +-
.../scala/tools/nsc/typechecker/Contexts.scala | 32 +--
.../tools/nsc/typechecker/DestructureTypes.scala | 20 +-
.../scala/tools/nsc/typechecker/Duplicators.scala | 38 ++--
.../scala/tools/nsc/typechecker/Implicits.scala | 12 +-
.../tools/nsc/typechecker/MethodSynthesis.scala | 70 +++---
.../scala/tools/nsc/typechecker/Namers.scala | 22 +-
.../tools/nsc/typechecker/NamesDefaults.scala | 2 +-
.../tools/nsc/typechecker/PatternMatching.scala | 102 ++++-----
.../scala/tools/nsc/typechecker/TreeCheckers.scala | 14 +-
.../tools/nsc/typechecker/TypeDiagnostics.scala | 16 +-
.../scala/tools/nsc/typechecker/Typers.scala | 14 +-
.../scala/tools/nsc/typechecker/Unapplies.scala | 10 +-
src/compiler/scala/tools/nsc/util/ClassPath.scala | 44 ++--
.../scala/tools/nsc/util/CommandLineParser.scala | 8 +-
.../scala/tools/nsc/util/JavaCharArrayReader.scala | 51 +++--
.../scala/tools/nsc/util/ScalaClassLoader.scala | 62 +++---
.../scala/tools/nsc/util/SimpleTracer.scala | 2 +-
src/compiler/scala/tools/nsc/util/package.scala | 22 +-
.../scala/tools/reflect/ToolBoxFactory.scala | 4 +-
src/compiler/scala/tools/util/Javap.scala | 4 +-
src/compiler/scala/tools/util/PathResolver.scala | 12 +-
.../scala/util/continuations/ControlContext.scala | 4 +-
.../library/scala/util/continuations/package.scala | 6 +-
src/detach/plugin/scala/tools/detach/Detach.scala | 2 +-
src/partest/scala/tools/partest/CompilerTest.scala | 3 +-
src/partest/scala/tools/partest/SecurityTest.scala | 22 +-
src/partest/scala/tools/partest/TestUtil.scala | 14 +-
.../partest/instrumented/Instrumentation.scala | 1 -
.../tools/partest/nest/ConsoleFileManager.scala | 20 +-
.../scala/tools/partest/nest/ConsoleRunner.scala | 2 +-
.../scala/tools/partest/nest/FileManager.scala | 8 +-
src/partest/scala/tools/partest/nest/NestUI.scala | 20 +-
.../tools/partest/nest/ReflectiveRunner.scala | 9 +-
.../scala/tools/partest/nest/RunnerManager.scala | 8 +-
.../scala/tools/partest/nest/RunnerUtils.scala | 46 ++--
src/partest/scala/tools/partest/package.scala | 8 +-
.../scala/tools/partest/utils/PrintMgr.scala | 104 ++++-----
.../scala/reflect/internal/AnnotationInfos.scala | 11 +-
.../scala/reflect/internal/BuildUtils.scala | 2 +
.../reflect/internal/ClassfileConstants.scala | 12 +-
.../scala/reflect/internal/Definitions.scala | 133 +++++------
.../reflect/internal/ExistentialsAndSkolems.scala | 1 +
src/reflect/scala/reflect/internal/Importers.scala | 2 +-
src/reflect/scala/reflect/internal/Names.scala | 64 +++---
src/reflect/scala/reflect/internal/Printers.scala | 4 +-
src/reflect/scala/reflect/internal/Scopes.scala | 2 +-
src/reflect/scala/reflect/internal/StdNames.scala | 242 ++++++++++-----------
.../scala/reflect/internal/SymbolTable.scala | 3 +-
src/reflect/scala/reflect/internal/Symbols.scala | 125 +++++------
src/reflect/scala/reflect/internal/TreeGen.scala | 12 +-
src/reflect/scala/reflect/internal/TreeInfo.scala | 58 ++---
src/reflect/scala/reflect/internal/Trees.scala | 2 +-
.../scala/reflect/internal/TypeDebugging.scala | 4 +-
src/reflect/scala/reflect/internal/Types.scala | 196 ++++++++---------
.../reflect/internal/pickling/PickleBuffer.scala | 2 +-
.../reflect/internal/pickling/PickleFormat.scala | 2 +-
.../reflect/internal/pickling/UnPickler.scala | 14 +-
.../scala/reflect/internal/util/Collections.scala | 54 ++---
.../scala/reflect/internal/util/HashSet.scala | 4 +-
.../scala/reflect/internal/util/Origins.scala | 2 +
.../scala/reflect/internal/util/Position.scala | 2 +-
.../scala/reflect/internal/util/SourceFile.scala | 9 +-
.../scala/reflect/internal/util/StringOps.scala | 46 ++--
.../scala/reflect/internal/util/TableDef.scala | 8 +-
.../internal/util/TraceSymbolActivity.scala | 4 +-
.../scala/reflect/internal/util/WeakHashSet.scala | 3 +
src/reflect/scala/reflect/io/AbstractFile.scala | 12 +-
src/reflect/scala/reflect/io/Directory.scala | 17 +-
src/reflect/scala/reflect/io/File.scala | 104 ++++-----
src/reflect/scala/reflect/io/Path.scala | 34 +--
src/reflect/scala/reflect/io/PlainFile.scala | 12 +-
src/reflect/scala/reflect/io/Streamable.scala | 10 +-
.../scala/reflect/io/VirtualDirectory.scala | 5 +-
src/reflect/scala/reflect/io/VirtualFile.scala | 4 +-
src/reflect/scala/reflect/io/ZipArchive.scala | 10 +-
src/reflect/scala/reflect/macros/TreeBuilder.scala | 1 +
.../scala/reflect/runtime/JavaMirrors.scala | 19 +-
.../scala/reflect/runtime/JavaUniverse.scala | 5 +-
.../reflect/runtime/SynchronizedSymbols.scala | 4 +-
src/reflect/scala/reflect/runtime/package.scala | 2 +-
193 files changed, 2660 insertions(+), 2579 deletions(-)
(limited to 'src')
diff --git a/src/compiler/scala/reflect/reify/Errors.scala b/src/compiler/scala/reflect/reify/Errors.scala
index 9e59b40236..a72233274e 100644
--- a/src/compiler/scala/reflect/reify/Errors.scala
+++ b/src/compiler/scala/reflect/reify/Errors.scala
@@ -21,10 +21,10 @@ trait Errors {
throw new ReificationException(defaultErrorPosition, msg)
}
- // def CannotReifySymbol(sym: Symbol) = {
- // val msg = "implementation restriction: cannot reify symbol %s (%s)".format(sym, sym.accurateKindString)
- // throw new ReificationException(defaultErrorPosition, msg)
- // }
+ def CannotReifySymbol(sym: Symbol) = {
+ val msg = "implementation restriction: cannot reify symbol %s (%s)".format(sym, sym.accurateKindString)
+ throw new ReificationException(defaultErrorPosition, msg)
+ }
def CannotReifyWeakType(details: Any) = {
val msg = "cannot create a TypeTag" + details + ": use WeakTypeTag instead"
diff --git a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
index d0f8ae76e2..6554947f88 100644
--- a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
+++ b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala
@@ -91,20 +91,20 @@ trait GenUtils {
def termPath(fullname: String): Tree = path(fullname, newTermName)
/** An (unreified) path that refers to type definition with given fully qualified name */
- // def typePath(fullname: String): Tree = path(fullname, newTypeName)
-
- // def isTough(tpe: Type) = {
- // def isTough(tpe: Type) = tpe match {
- // case _: RefinedType => true
- // case _: ExistentialType => true
- // case _: ClassInfoType => true
- // case _: MethodType => true
- // case _: PolyType => true
- // case _ => false
- // }
+ def typePath(fullname: String): Tree = path(fullname, newTypeName)
+
+ def isTough(tpe: Type) = {
+ def isTough(tpe: Type) = tpe match {
+ case _: RefinedType => true
+ case _: ExistentialType => true
+ case _: ClassInfoType => true
+ case _: MethodType => true
+ case _: PolyType => true
+ case _ => false
+ }
- // tpe != null && (tpe exists isTough)
- // }
+ tpe != null && (tpe exists isTough)
+ }
object TypedOrAnnotated {
def unapply(tree: Tree): Option[Tree] = tree match {
@@ -117,14 +117,14 @@ trait GenUtils {
}
}
- // def isAnnotated(tpe: Type) = {
- // def isAnnotated(tpe: Type) = tpe match {
- // case _: AnnotatedType => true
- // case _ => false
- // }
+ def isAnnotated(tpe: Type) = {
+ def isAnnotated(tpe: Type) = tpe match {
+ case _: AnnotatedType => true
+ case _ => false
+ }
- // tpe != null && (tpe exists isAnnotated)
- // }
+ tpe != null && (tpe exists isAnnotated)
+ }
def isSemiConcreteTypeMember(tpe: Type) = tpe match {
case TypeRef(SingleType(_, _), sym, _) if sym.isAbstractType && !sym.isExistential => true
diff --git a/src/compiler/scala/reflect/reify/phases/Metalevels.scala b/src/compiler/scala/reflect/reify/phases/Metalevels.scala
index cccf080dbf..92d951c3a1 100644
--- a/src/compiler/scala/reflect/reify/phases/Metalevels.scala
+++ b/src/compiler/scala/reflect/reify/phases/Metalevels.scala
@@ -1,8 +1,6 @@
package scala.reflect.reify
package phases
-import scala.collection.{ mutable }
-
trait Metalevels {
self: Reifier =>
@@ -103,7 +101,7 @@ trait Metalevels {
*/
val metalevels = new Transformer {
var insideSplice = false
- val inlineableBindings = mutable.Map[TermName, Tree]()
+ var inlineableBindings = scala.collection.mutable.Map[TermName, Tree]()
def withinSplice[T](op: => T) = {
val old = insideSplice
diff --git a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
index 6e34d64847..99118c4f2e 100644
--- a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
+++ b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala
@@ -15,7 +15,7 @@ trait SymbolTables {
private[SymbolTable] val original: Option[List[Tree]] = None) {
def syms: List[Symbol] = symtab.keys.toList
- // def isConcrete: Boolean = symtab.values forall (sym => !FreeTypeDef.unapply(sym).isDefined)
+ def isConcrete: Boolean = symtab.values forall (sym => !FreeTypeDef.unapply(sym).isDefined)
// def aliases: Map[Symbol, List[TermName]] = aliases.distinct groupBy (_._1) mapValues (_ map (_._2))
diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala
index d0fefdaa03..fde61e9564 100644
--- a/src/compiler/scala/tools/ant/sabbus/Settings.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Settings.scala
@@ -10,7 +10,7 @@ package scala.tools.ant.sabbus
import java.io.File
-import org.apache.tools.ant.types.Path
+import org.apache.tools.ant.types.{Path, Reference}
class Settings {
diff --git a/src/compiler/scala/tools/cmd/FromString.scala b/src/compiler/scala/tools/cmd/FromString.scala
index c9df9f9145..2a624875ee 100644
--- a/src/compiler/scala/tools/cmd/FromString.scala
+++ b/src/compiler/scala/tools/cmd/FromString.scala
@@ -25,17 +25,17 @@ abstract class FromString[+T](implicit t: ru.TypeTag[T]) extends PartialFunction
object FromString {
// We need these because we clash with the String => Path implicits.
- // private def toFile(s: String) = new File(new java.io.File(s))
+ private def toFile(s: String) = new File(new java.io.File(s))
private def toDir(s: String) = new Directory(new java.io.File(s))
/** Path related stringifiers.
*/
- // val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
- // override def isDefinedAt(s: String) = toFile(s).isFile
- // def apply(s: String): File =
- // if (isDefinedAt(s)) toFile(s)
- // else cmd.runAndExit(println("'%s' is not an existing file." format s))
- // }
+ val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
+ override def isDefinedAt(s: String) = toFile(s).isFile
+ def apply(s: String): File =
+ if (isDefinedAt(s)) toFile(s)
+ else cmd.runAndExit(println("'%s' is not an existing file." format s))
+ }
val ExistingDir: FromString[Directory] = new FromString[Directory]()(tagOfDirectory) {
override def isDefinedAt(s: String) = toDir(s).isDirectory
def apply(s: String): Directory =
diff --git a/src/compiler/scala/tools/cmd/Reference.scala b/src/compiler/scala/tools/cmd/Reference.scala
index 4f1620d61a..d4f2060f81 100644
--- a/src/compiler/scala/tools/cmd/Reference.scala
+++ b/src/compiler/scala/tools/cmd/Reference.scala
@@ -26,7 +26,7 @@ trait Reference extends Spec {
def isUnaryOption(s: String) = unary contains toOpt(s)
def isBinaryOption(s: String) = binary contains toOpt(s)
def isExpandOption(s: String) = expansionMap contains toOpt(s)
- // def isAnyOption(s: String) = isUnaryOption(s) || isBinaryOption(s) || isExpandOption(s)
+ def isAnyOption(s: String) = isUnaryOption(s) || isBinaryOption(s) || isExpandOption(s)
def expandArg(arg: String) = expansionMap.getOrElse(fromOpt(arg), List(arg))
diff --git a/src/compiler/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala
index 6d523552b8..5be819c134 100644
--- a/src/compiler/scala/tools/nsc/CompilationUnits.scala
+++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala
@@ -26,7 +26,7 @@ trait CompilationUnits { self: Global =>
class CompilationUnit(val source: SourceFile) extends CompilationUnitContextApi {
/** the fresh name creator */
- val fresh: FreshNameCreator = new FreshNameCreator.Default
+ var fresh: FreshNameCreator = new FreshNameCreator.Default
def freshTermName(prefix: String): TermName = newTermName(fresh.newName(prefix))
def freshTypeName(prefix: String): TypeName = newTypeName(fresh.newName(prefix))
@@ -108,16 +108,16 @@ trait CompilationUnits { self: Global =>
override def toString() = source.toString()
- // def clear() {
- // fresh = new FreshNameCreator.Default
- // body = EmptyTree
- // depends.clear()
- // defined.clear()
- // synthetics.clear()
- // toCheck.clear()
- // checkedFeatures = Set()
- // icode.clear()
- // }
+ def clear() {
+ fresh = new FreshNameCreator.Default
+ body = EmptyTree
+ depends.clear()
+ defined.clear()
+ synthetics.clear()
+ toCheck.clear()
+ checkedFeatures = Set()
+ icode.clear()
+ }
}
}
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index 11ee34af99..521f788fa1 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -29,7 +29,7 @@ class StandardCompileServer extends SocketServer {
var shutdown = false
var verbose = false
- // val versionMsg = "Fast " + Properties.versionMsg
+ val versionMsg = "Fast " + Properties.versionMsg
val MaxCharge = 0.8
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index 577d28f5f6..829e097714 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -15,7 +15,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
type Setting = Settings#Setting
/** file extensions of files that the compiler can process */
- // lazy val fileEndings = Properties.fileEndings
+ lazy val fileEndings = Properties.fileEndings
private val processArgumentsResult =
if (shouldProcessArguments) processArguments
@@ -40,8 +40,8 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
""".stripMargin.trim + "\n"
def shortUsage = "Usage: %s