diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-21 00:50:15 -0800 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-21 00:50:15 -0800 |
| commit | 26387cacaa8f78105419044fc33acc8fd8343662 (patch) | |
| tree | 15fe66051230bb183786d945c65270cb49049cd6 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | af89c3d258c98351868e5ed5acee97e5b2268452 (diff) | |
| parent | 07ff3a99b75174c4e4a4e52348b34aa0b68f51b1 (diff) | |
| download | scala-26387cacaa8f78105419044fc33acc8fd8343662.tar.gz scala-26387cacaa8f78105419044fc33acc8fd8343662.tar.bz2 scala-26387cacaa8f78105419044fc33acc8fd8343662.zip | |
Merge pull request #3368 from retronym/ticket/8151
SI-8151 Remove -Yself-in-annots and associated implementation
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 06a1e21e8b..91321d4700 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -389,7 +389,7 @@ trait Implicits { private def dominates(dtor: Type, dted: Type): Boolean = { def core(tp: Type): Type = tp.dealiasWiden match { case RefinedType(parents, defs) => intersectionType(parents map core, tp.typeSymbol.owner) - case AnnotatedType(annots, tp, selfsym) => core(tp) + case AnnotatedType(annots, tp) => core(tp) case ExistentialType(tparams, result) => core(result).subst(tparams, tparams map (t => core(t.info.bounds.hi))) case PolyType(tparams, result) => core(result).subst(tparams, tparams map (t => core(t.info.bounds.hi))) case _ => tp @@ -1060,7 +1060,7 @@ trait Implicits { getParts(restpe) case RefinedType(ps, _) => for (p <- ps) getParts(p) - case AnnotatedType(_, t, _) => + case AnnotatedType(_, t) => getParts(t) case ExistentialType(_, t) => getParts(t) |