diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-09-01 14:46:37 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-09-02 07:14:16 +0200 |
| commit | 2277d37982bffb666b5c4bdb655d44234885e0bb (patch) | |
| tree | 3da8419d8ff5a6056aa4a8856aefe63486257867 /src/compiler/scala/tools/nsc/transform/Mixin.scala | |
| parent | fdfdd253bfb4e44faf4afce1da56989ce132e15c (diff) | |
| download | scala-2277d37982bffb666b5c4bdb655d44234885e0bb.tar.gz scala-2277d37982bffb666b5c4bdb655d44234885e0bb.tar.bz2 scala-2277d37982bffb666b5c4bdb655d44234885e0bb.zip | |
Add a -Xmixin-force-forwarders ChoiceSetting
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 58f32b9aca..af9ba7c300 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -287,14 +287,14 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { } def generateJUnitForwarder: Boolean = { - !settings.junitTraitMethodsNoForwarders && + settings.mixinForwarderChoices.isJunit && member.annotations.nonEmpty && JUnitAnnotations.exists(annot => annot.exists && member.hasAnnotation(annot)) } if (existsCompetingMethod(clazz.baseClasses) || generateJUnitForwarder) genForwarder(required = true) - else if (settings.XgenMixinForwarders) + else if (settings.mixinForwarderChoices.isTruthy) genForwarder(required = false) } |