From 72112ced2deed859ff9dfa1a1c010217bb98114f Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 28 Jan 2014 08:22:26 +0100 Subject: Unhardcode use of scala.util.Try In favour of the type defined by the active FutureSystem. --- src/main/scala/scala/async/internal/AsyncTransform.scala | 3 ++- src/main/scala/scala/async/internal/TransformUtils.scala | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala index 352ef71..ca53ff1 100644 --- a/src/main/scala/scala/async/internal/AsyncTransform.scala +++ b/src/main/scala/scala/async/internal/AsyncTransform.scala @@ -51,7 +51,8 @@ trait AsyncTransform { List(emptyConstructor, stateVar, result, execContextValDef) ++ List(resumeFunTreeDummyBody, applyDefDefDummyBody, apply0DefDef, extraValDef) } - val template = Template(List(typeOf[(scala.util.Try[Any] => Unit)], typeOf[() => Unit]).map(TypeTree(_)), emptyValDef, body) + val tryToUnit = appliedType(definitions.FunctionClass(1), futureSystemOps.tryType[Any], typeOf[Unit]) + val template = Template(List(tryToUnit, typeOf[() => Unit]).map(TypeTree(_)), emptyValDef, body) val t = ClassDef(NoMods, name.stateMachineT, Nil, template) callSiteTyper.typedPos(macroPos)(Block(t :: Nil, Literal(Constant(())))) diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 45baa48..f228e1d 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -84,10 +84,6 @@ private[async] trait TransformUtils { self.splice.get } - val TryClass = rootMirror.staticClass("scala.util.Try") - val Try_get = TryClass.typeSignature.member(newTermName("get")).ensuring(_ != NoSymbol) - val Try_isFailure = TryClass.typeSignature.member(newTermName("isFailure")).ensuring(_ != NoSymbol) - val TryAnyType = appliedType(TryClass.toType, List(definitions.AnyTpe)) val NonFatalClass = rootMirror.staticModule("scala.util.control.NonFatal") val Async_await = asyncBase.awaitMethod(global)(macroApplication.symbol).ensuring(_ != NoSymbol) } -- cgit v1.2.3