summaryrefslogtreecommitdiff
path: root/src/interactive
diff options
context:
space:
mode:
authormpociecha <michal.pociecha@gmail.com>2014-11-30 23:52:37 +0100
committermpociecha <michal.pociecha@gmail.com>2014-12-05 01:21:04 +0100
commita8c43dc5caf7439dbcb47f6c25b33fb6b3ed8705 (patch)
treecca10ee42c3f7c9ad576fc657ca22f8a24f0749a /src/interactive
parentdfc5c1d7225163994e3bc1cf67ccbee8c4de75fc (diff)
downloadscala-a8c43dc5caf7439dbcb47f6c25b33fb6b3ed8705.tar.gz
scala-a8c43dc5caf7439dbcb47f6c25b33fb6b3ed8705.tar.bz2
scala-a8c43dc5caf7439dbcb47f6c25b33fb6b3ed8705.zip
Cleanup and refactoring - semicolons, unused or commented out code
This commit contains some minor changes made by the way when implementing flat classpath. Sample JUnit test that shows that all pieces of JUnit infrastructure work correctly now uses assert method form JUnit as it should do from the beginning. I removed commented out lines which were obvious to me. In the case of less obvious commented out lines I added TODOs as someone should look at such places some day and clean them up. I removed also some unnecessary semicolons and unused imports. Many string concatenations using + have been changed to string interpolation. There's removed unused, private walkIterator method from ZipArchive. It seems that it was unused since this commit: https://github.com/scala/scala/commit/9d4994b96c77d914687433586eb6d1f9e49c520f However, I had to add an exception for the compatibility checker because it was complaining about this change. I made some trivial corrections/optimisations like use 'findClassFile' method instead of 'findClass' in combination with 'binary' to find the class file.
Diffstat (limited to 'src/interactive')
-rw-r--r--src/interactive/scala/tools/nsc/interactive/Global.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
index 7df809b6ff..5d00141e6a 100644
--- a/src/interactive/scala/tools/nsc/interactive/Global.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -128,8 +128,8 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
else NullLogger
import log.logreplay
- debugLog("logger: " + log.getClass + " writing to " + (new java.io.File(logName)).getAbsolutePath)
- debugLog("classpath: "+classPath)
+ debugLog(s"logger: ${log.getClass} writing to ${(new java.io.File(logName)).getAbsolutePath}")
+ debugLog(s"classpath: $classPath")
private var curTime = System.nanoTime
private def timeStep = {