diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-10-11 18:18:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-11 18:18:58 -0700 |
commit | 1e81a09a896a0d7497687b5df1b8220172eaec92 (patch) | |
tree | 0d699078ffa1541e76b9f81f9dd93ea3f1cb74a7 /src/compiler/scala/tools/nsc/transform | |
parent | 95b1427e7e655ea1ba04195fabf151fbae5789a1 (diff) | |
parent | 550e47b7878c2cfe334d3b64b879afd600d162e3 (diff) | |
download | scala-1e81a09a896a0d7497687b5df1b8220172eaec92.tar.gz scala-1e81a09a896a0d7497687b5df1b8220172eaec92.tar.bz2 scala-1e81a09a896a0d7497687b5df1b8220172eaec92.zip |
Merge pull request #5429 from lrytz/sd224
Default -Xmixin-force-forwarders to true
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index e62a12ce67..56d11d85a6 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -219,9 +219,10 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL with AccessorSynthes def genForwarder(required: Boolean): Unit = { val owner = member.owner if (owner.isJavaDefined && owner.isInterface && !clazz.parentSymbols.contains(owner)) { - val text = s"Unable to implement a mixin forwarder for $member in $clazz unless interface ${owner.name} is directly extended by $clazz." - if (required) reporter.error(clazz.pos, text) - else warning(clazz.pos, text) + if (required) { + val text = s"Unable to implement a mixin forwarder for $member in $clazz unless interface ${owner.name} is directly extended by $clazz." + reporter.error(clazz.pos, text) + } } else cloneAndAddMixinMember(mixinClass, member).asInstanceOf[TermSymbol] setAlias member } @@ -260,7 +261,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL with AccessorSynthes } def generateJUnitForwarder: Boolean = { - settings.mixinForwarderChoices.isJunit && + settings.mixinForwarderChoices.isAtLeastJunit && member.annotations.nonEmpty && JUnitAnnotations.exists(annot => annot.exists && member.hasAnnotation(annot)) } |