diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-03 15:57:22 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-08-09 18:57:15 -0700 |
| commit | aab103eb999e2816c87c5010e7f7c79ed993fb90 (patch) | |
| tree | 3cc2fefed8410c23e5a692eabc12b20041c5d460 /src/reflect/scala/reflect | |
| parent | 961c8bea011559af65cfae9818d71ad35b6ecaf4 (diff) | |
| download | scala-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/reflect/scala/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 0342daf113..3dec73da58 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -362,7 +362,6 @@ trait Definitions extends api.StandardDefinitions { // classes with special meanings lazy val StringAddClass = requiredClass[scala.runtime.StringAdd] lazy val ScalaNumberClass = requiredClass[scala.math.ScalaNumber] - lazy val TraitSetterAnnotationClass = requiredClass[scala.runtime.TraitSetter] lazy val DelayedInitClass = requiredClass[scala.DelayedInit] def delayedInitMethod = getMemberMethod(DelayedInitClass, nme.delayedInit) @@ -1470,6 +1469,7 @@ trait Definitions extends api.StandardDefinitions { lazy val StringAdd_+ = getMemberMethod(StringAddClass, nme.PLUS) // The given symbol represents either String.+ or StringAdd.+ + // TODO: this misses Predef.any2stringadd def isStringAddition(sym: Symbol) = sym == String_+ || sym == StringAdd_+ lazy val StringContext_f = getMemberMethod(StringContextClass, nme.f) diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index 0a90a141d3..caef5535b4 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -247,7 +247,6 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.SymbolModule definitions.StringAddClass definitions.ScalaNumberClass - definitions.TraitSetterAnnotationClass definitions.DelayedInitClass definitions.TypeConstraintClass definitions.SingletonClass |