summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-09-02 12:51:08 +0200
committerGitHub <noreply@github.com>2016-09-02 12:51:08 +0200
commit50462a45dcbe91ef43652c235721b7a7ec0c8bb2 (patch)
tree1fdcdd15dfee8a49f38de80b5a265fb50d196723 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parentf90bf565a529d0e95155992a3c243952183f25a5 (diff)
parent2277d37982bffb666b5c4bdb655d44234885e0bb (diff)
downloadscala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.tar.gz
scala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.tar.bz2
scala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.zip
Merge pull request #5369 from lrytz/sd210
Fixes to mixin forwarders
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 3360599c1b..d8183ea8df 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -2040,7 +2040,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
override def matches(sym: Symbol, sym1: Symbol) =
if (sym.isSkolem) matches(sym.deSkolemize, sym1)
else if (sym1.isSkolem) matches(sym, sym1.deSkolemize)
- else super[SubstTypeMap].matches(sym, sym1)
+ else super.matches(sym, sym1)
}
// allow defaults on by-name parameters
if (sym hasFlag BYNAMEPARAM)