summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/CompileServer.scala
diff options
context:
space:
mode:
authorJames Iry <james.iry@typesafe.com>2012-12-03 09:23:59 -0800
committerJames Iry <james.iry@typesafe.com>2012-12-07 10:28:29 -0800
commit593a7605d4a157ff59700741542a3581025f67e7 (patch)
treef87a3c4b7d1d2b59ce820d3c480b0363523e2df0 /src/compiler/scala/tools/nsc/CompileServer.scala
parentb1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff)
downloadscala-593a7605d4a157ff59700741542a3581025f67e7.tar.gz
scala-593a7605d4a157ff59700741542a3581025f67e7.tar.bz2
scala-593a7605d4a157ff59700741542a3581025f67e7.zip
Small cleanup work done during my initial visits to the code.
These are just a series of small cleanups I did while reading the code base during my first few days. None are actual functionality bugs and none warrant a full blown bug. Now that I'm moving on to doing real work small stuff like this will likely be swept up in other bugs, so this commit just captures that initial pass of stuff.
Diffstat (limited to 'src/compiler/scala/tools/nsc/CompileServer.scala')
-rw-r--r--src/compiler/scala/tools/nsc/CompileServer.scala5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index f79990d526..e4c250a3d9 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -56,9 +56,6 @@ class StandardCompileServer extends SocketServer {
(totalMemory - freeMemory).toDouble / maxMemory.toDouble > MaxCharge
}
- protected def newOfflineCompilerCommand(arguments: List[String], settings: FscSettings): OfflineCompilerCommand =
- new OfflineCompilerCommand(arguments, settings)
-
/** Problematically, Settings are only considered equal if every setting
* is exactly equal. In fsc this immediately breaks down because the randomly
* chosen temporary outdirs differ between client and server. Among other
@@ -91,7 +88,7 @@ class StandardCompileServer extends SocketServer {
val args = input.split("\0", -1).toList
val newSettings = new FscSettings(fscError)
this.verbose = newSettings.verbose.value
- val command = newOfflineCompilerCommand(args, newSettings)
+ val command = new OfflineCompilerCommand(args, newSettings)
info("Settings after normalizing paths: " + newSettings)
printMemoryStats()