diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-01-15 12:25:41 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-15 12:32:36 +0100 |
commit | 07ff3a99b75174c4e4a4e52348b34aa0b68f51b1 (patch) | |
tree | de5bbfbbc7ddde80ae5b1a97a6a8f6b6560da8af /src/reflect/scala/reflect/internal/Variances.scala | |
parent | e089cafb5fd02e2457bafde3252da3a771d3180e (diff) | |
download | scala-07ff3a99b75174c4e4a4e52348b34aa0b68f51b1.tar.gz scala-07ff3a99b75174c4e4a4e52348b34aa0b68f51b1.tar.bz2 scala-07ff3a99b75174c4e4a4e52348b34aa0b68f51b1.zip |
SI-8151 Remove -Yself-in-annots and associated implementation
This experimental option typechecked arguments of annotations
with an injected value in scope named `self`:
@Foo(self.foo < 1)
This has been slated for removal [1] for some time.
This commit removes it in one fell swoop, without any attempt
at source compatibility with code that constructs or pattern
matches on AnnotatedType.
[1] https://groups.google.com/d/msg/scala-internals/VdZ5UJwQFGI/C6tZ493Yxx4J
Diffstat (limited to 'src/reflect/scala/reflect/internal/Variances.scala')
-rw-r--r-- | src/reflect/scala/reflect/internal/Variances.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Variances.scala b/src/reflect/scala/reflect/internal/Variances.scala index cd09e83cd3..a7cac5254c 100644 --- a/src/reflect/scala/reflect/internal/Variances.scala +++ b/src/reflect/scala/reflect/internal/Variances.scala @@ -84,7 +84,7 @@ trait Variances { loop(base, Covariant) } def isUncheckedVariance(tp: Type) = tp match { - case AnnotatedType(annots, _, _) => annots exists (_ matches definitions.uncheckedVarianceClass) + case AnnotatedType(annots, _) => annots exists (_ matches definitions.uncheckedVarianceClass) case _ => false } @@ -202,7 +202,7 @@ trait Variances { case MethodType(params, restpe) => inSyms(params).flip & inType(restpe) case PolyType(tparams, restpe) => inSyms(tparams).flip & inType(restpe) case ExistentialType(tparams, restpe) => inSyms(tparams) & inType(restpe) - case AnnotatedType(annots, tp, _) => inTypes(annots map (_.atp)) & inType(tp) + case AnnotatedType(annots, tp) => inTypes(annots map (_.atp)) & inType(tp) } inType(tp) |