diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-14 23:00:27 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-15 13:05:57 +0100 |
commit | 2f4b6a01e7106be9156a8f9cc885a0e7f4dd8557 (patch) | |
tree | 0126d3adb3c6c92c9abfd971fcaf74d9ecd805e1 /src | |
parent | aeb95bca8b43ea944e68d9370ade3fad94dad92e (diff) | |
download | scala-async-2f4b6a01e7106be9156a8f9cc885a0e7f4dd8557.tar.gz scala-async-2f4b6a01e7106be9156a8f9cc885a0e7f4dd8557.tar.bz2 scala-async-2f4b6a01e7106be9156a8f9cc885a0e7f4dd8557.zip |
eliminates all usages of global in TransformUtils
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 95d3f16..eb48d4f 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -82,7 +82,7 @@ private[async] trait TransformUtils { } val NonFatalClass = rootMirror.staticModule("scala.util.control.NonFatal") - val Async_await = asyncBase.awaitMethod(global)(macroApplication.symbol).ensuring(_ != NoSymbol) + val Async_await = asyncBase.awaitMethod(c.universe)(macroApplication.symbol).ensuring(_ != NoSymbol) } def isSafeToInline(tree: Tree) = { @@ -256,7 +256,8 @@ private[async] trait TransformUtils { // ===================================== // Copy/Pasted from Scala 2.10.3. See SI-7694. private lazy val UncheckedBoundsClass = { - global.rootMirror.getClassIfDefined("scala.reflect.internal.annotations.uncheckedBounds") + try c.mirror.staticClass("scala.reflect.internal.annotations.uncheckedBounds") + catch { case _: ScalaReflectionException => NoSymbol } } final def uncheckedBounds(tp: Type): Type = { if (tp.typeArgs.isEmpty || UncheckedBoundsClass == NoSymbol) tp |