diff options
4 files changed, 3 insertions, 8 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala index 7be6b43..6540bdb 100644 --- a/src/main/scala/scala/async/internal/AsyncAnalysis.scala +++ b/src/main/scala/scala/async/internal/AsyncAnalysis.scala @@ -61,7 +61,7 @@ trait AsyncAnalysis { case Return(_) => c.abort(tree.pos, "return is illegal within a async block") case DefDef(mods, _, _, _, _, _) if mods.hasFlag(Flag.LAZY) && containsAwait => - reportUnsupportedAwait(tree, "lazy val initalizer") + reportUnsupportedAwait(tree, "lazy val initializer") case CaseDef(_, guard, _) if guard exists isAwait => // TODO lift this restriction reportUnsupportedAwait(tree, "pattern guard") diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala index aae9dea..aca8c7e 100644 --- a/src/main/scala/scala/async/internal/AsyncTransform.scala +++ b/src/main/scala/scala/async/internal/AsyncTransform.scala @@ -54,7 +54,7 @@ trait AsyncTransform { } val tryToUnit = appliedType(definitions.FunctionClass(1), futureSystemOps.tryType[Any], typeOf[Unit]) - val template = Template(List(tryToUnit, typeOf[() => Unit]).map(TypeTree(_)), emptyValDef, body).setType(NoType) + val template = Template(List(tryToUnit, typeOf[() => Unit]).map(TypeTree(_)), emptyValDef, body) val t = ClassDef(NoMods, name.stateMachineT, Nil, template) typecheckClassDef(t) diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala index f9264c7..2af691f 100644 --- a/src/test/scala/scala/async/neg/NakedAwait.scala +++ b/src/test/scala/scala/async/neg/NakedAwait.scala @@ -163,7 +163,7 @@ class NakedAwait { @Test def lazyValIllegal() { - expectError("await must not be used under a lazy val initalizer") { + expectError("await must not be used under a lazy val initializer") { """ | import _root_.scala.async.internal.AsyncId._ | def foo(): Any = async { val x = { lazy val y = await(0); y } } diff --git a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala index 6214b43..701d5d6 100644 --- a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala +++ b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala @@ -6,11 +6,6 @@ package scala.async package run package lazyval -import scala.async.run.noawait - -import scala.async.internal.AsyncId -import scala.async.internal.AsyncId -import AsyncId._ import org.junit.Test import scala.async.internal.AsyncId._ |