diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-11-19 09:59:47 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-11-19 09:59:47 +1000 |
| commit | 74046bb943f33dfa6009af0ddfa9e2f7949b1d58 (patch) | |
| tree | 3b0f905f198936c981d7d1f04ab789eb0d1d40e0 /src | |
| parent | b2ba80ac84f7125fd9e5c40adf0a2874c3fa9e3c (diff) | |
| parent | a77f01f546312cf6601f03794f909a09d34c5445 (diff) | |
| download | scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.tar.gz scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.tar.bz2 scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.zip | |
Merge pull request #4118 from retronym/ticket/5639
SI-5639 Fix spurious discarding of implicit import
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index e278130437..b13f9e94cc 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -798,7 +798,7 @@ trait Contexts { self: Analyzer => isAccessible(sym, pre) && !(imported && { val e = scope.lookupEntry(name) - (e ne null) && (e.owner == scope) + (e ne null) && (e.owner == scope) && (!settings.isScala212 || e.sym.exists) }) private def collectImplicits(syms: Scope, pre: Type, imported: Boolean = false): List[ImplicitInfo] = |