diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-23 13:40:14 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-05-12 22:19:02 +0200 |
| commit | c539ae2f56fe9f565cffb4afd6ab131bda89acb7 (patch) | |
| tree | 30c9472e80b9732b713ab0efa0c148827808276f /src/compiler/scala/reflect/macros/runtime/Typers.scala | |
| parent | a35b6bc8e4369db8983d6d0d9881f37d7affbadd (diff) | |
| download | scala-c539ae2f56fe9f565cffb4afd6ab131bda89acb7.tar.gz scala-c539ae2f56fe9f565cffb4afd6ab131bda89acb7.tar.bz2 scala-c539ae2f56fe9f565cffb4afd6ab131bda89acb7.zip | |
SI-7167 implicit macros decide what is divergence
This is a port of https://github.com/scala/scala/commit/8168f118c9 from 2.10.x,
with an additional change to the `enclosingImplicits` and `openImplicits` APIs,
which encapsulates tuples of `pt` and `tree` into `ImplicitCandidate`.
Diffstat (limited to 'src/compiler/scala/reflect/macros/runtime/Typers.scala')
| -rw-r--r-- | src/compiler/scala/reflect/macros/runtime/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/macros/runtime/Typers.scala b/src/compiler/scala/reflect/macros/runtime/Typers.scala index 398770ab35..30370119fe 100644 --- a/src/compiler/scala/reflect/macros/runtime/Typers.scala +++ b/src/compiler/scala/reflect/macros/runtime/Typers.scala @@ -8,7 +8,7 @@ trait Typers { def openMacros: List[Context] = this :: universe.analyzer.openMacros - def openImplicits: List[(Type, Tree)] = callsiteTyper.context.openImplicits + def openImplicits: List[ImplicitCandidate] = callsiteTyper.context.openImplicits.map(_.toImplicitCandidate) /** * @see [[scala.tools.reflect.ToolBox.typeCheck]] |