summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-02-22 16:08:26 -0800
committerAdriaan Moors <adriaan@lightbend.com>2017-04-06 18:13:17 -0700
commitc04bcdc6dedf3e4cf3e6a608a66978841abc6171 (patch)
treead879924e095d04747ef14dd4291d611fb77d4e4 /src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
parentd8613df1cd6545f85767bf649a483621676b5893 (diff)
downloadscala-c04bcdc6dedf3e4cf3e6a608a66978841abc6171.tar.gz
scala-c04bcdc6dedf3e4cf3e6a608a66978841abc6171.tar.bz2
scala-c04bcdc6dedf3e4cf3e6a608a66978841abc6171.zip
Refactor to reduce assignSymbol indirection
- remove logging wrapper that also does important work - `assignAndEnterSymbol(tree)` --> `enterInScope(assignMemberSymbol(tree))` - reduce redundant type test (we know it's an import/package/member)
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
index 0f257d3717..fd9a45166e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
@@ -221,7 +221,7 @@ trait MethodSynthesis {
def enterImplicitWrapper(classDef: ClassDef): Unit = {
val methDef = factoryMeth(classDef.mods & AccessFlags | METHOD | IMPLICIT | SYNTHETIC, classDef.name.toTermName, classDef)
- val methSym = assignAndEnterSymbol(methDef)
+ val methSym = enterInScope(assignMemberSymbol(methDef))
context.unit.synthetics(methSym) = methDef
methSym setInfo implicitFactoryMethodCompleter(methDef, classDef.symbol, completerOf(methDef).asInstanceOf[LockingTypeCompleter])
}