summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-06-03 15:57:22 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-08-09 18:57:15 -0700
commitaab103eb999e2816c87c5010e7f7c79ed993fb90 (patch)
tree3cc2fefed8410c23e5a692eabc12b20041c5d460 /src/compiler
parent961c8bea011559af65cfae9818d71ad35b6ecaf4 (diff)
downloadscala-aab103eb999e2816c87c5010e7f7c79ed993fb90.tar.gz
scala-aab103eb999e2816c87c5010e7f7c79ed993fb90.tar.bz2
scala-aab103eb999e2816c87c5010e7f7c79ed993fb90.zip
Do not add `@TraitSetter` -- not sure what it's for
Also deprecate the TraitSetter annotation.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/transform/Mixin.scala3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index d62b77dac2..b5084cffe1 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -479,9 +479,6 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
tree
case _ =>
- if (currentOwner.isTrait && sym.isSetter && !enteringPickler(sym.isDeferred)) {
- sym.addAnnotation(TraitSetterAnnotationClass)
- }
tree
}
}