1 files changed, 8 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/cmd/package.scala b/src/compiler/scala/tools/cmd/package.scala
index d605ecae8f..9754becf10 100644
--- a/src/compiler/scala/tools/cmd/package.scala
+++ b/src/compiler/scala/tools/cmd/package.scala
@@ -3,7 +3,8 @@
  * @author Paul Phillips
  */
 
-package scala.tools
+package scala
+package tools
 
 package object cmd {
   def returning[T](x: T)(f: T => Unit): T = { f(x) ; x }
@@ -12,19 +13,19 @@ package object cmd {
   implicit def implicitConversions = scala.language.implicitConversions
   implicit def postfixOps = scala.language.postfixOps
 
-  private[cmd] def debug(msg: String) = println(msg)
+  private[cmd] def debug(msg: String): Unit = println(msg)
 
   def runAndExit(body: => Unit): Nothing = {
     body
     sys.exit(0)
   }
 
-  def toOpt(s: String)              = if (s startsWith "--") s else "--" + s
-  def fromOpt(s: String)            = s stripPrefix "--"
-  def toArgs(line: String)          = Parser tokenize line
-  def fromArgs(args: List[String])  = args mkString " "
+  def toOpt(s: String): String             = if (s startsWith "--") s else "--" + s
+  def fromOpt(s: String): String           = s stripPrefix "--"
+  def toArgs(line: String): List[String]   = CommandLineParser tokenize line
+  def fromArgs(args: List[String]): String = args mkString " "
 
-  def stripQuotes(s: String) = {
+  def stripQuotes(s: String): String = {
     def isQuotedBy(c: Char) = s.length > 0 && s.head == c && s.last == c
     if (List('"', '\'') exists isQuotedBy) s.tail.init else s
   }