diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-21 07:36:39 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-21 07:36:39 -0700 |
commit | d816bc586080f89a823eb6bb96df17259307052c (patch) | |
tree | a5f4d0060a3a21d8a1a11e66231376914ec9cb57 /src/compiler/scala/tools/nsc/settings/MutableSettings.scala | |
parent | 7adab908d661f1b238a96972e96ed11ea497bcdc (diff) | |
parent | 645634a283969d6283c6a80a812c5da03bb6f2bf (diff) | |
download | scala-d816bc586080f89a823eb6bb96df17259307052c.tar.gz scala-d816bc586080f89a823eb6bb96df17259307052c.tar.bz2 scala-d816bc586080f89a823eb6bb96df17259307052c.zip |
Merge pull request #2239 from paulp/pr/warnings
Warnings removal and other cleanup.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/MutableSettings.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index cc77cbdf52..4d086e787e 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -486,8 +486,6 @@ class MutableSettings(val errorFn: String => Unit) descr: String, default: ScalaVersion) extends Setting(name, descr) { - import ScalaVersion._ - type T = ScalaVersion protected var v: T = NoScalaVersion @@ -495,14 +493,14 @@ class MutableSettings(val errorFn: String => Unit) value = default Some(args) } - + override def tryToSetColon(args: List[String]) = args match { case Nil => value = default; Some(Nil) case x :: xs => value = ScalaVersion(x, errorFn) ; Some(xs) } - + override def tryToSetFromPropertyValue(s: String) = tryToSet(List(s)) - + def unparse: List[String] = if (value == NoScalaVersion) Nil else List(s"${name}:${value.unparse}") withHelpSyntax(s"${name}:<${arg}>") |