diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index d81d688267..5eb99e0d98 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -136,7 +136,7 @@ trait ScalaSettings extends AbsScalaSettings helpArg = "mode", descr = "Generate forwarder methods in classes inhering concrete methods from traits.", choices = List("true", "junit", "false"), - default = "junit", + default = "true", choicesHelp = List( "Always generate mixin forwarders.", "Generate mixin forwarders for JUnit-annotated methods (JUnit 4 does not support default methods).", @@ -144,7 +144,7 @@ trait ScalaSettings extends AbsScalaSettings object mixinForwarderChoices { def isTruthy = XmixinForceForwarders.value == "true" - def isJunit = isTruthy || XmixinForceForwarders.value == "junit" + def isAtLeastJunit = isTruthy || XmixinForceForwarders.value == "junit" } // XML parsing options |