aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-03-27 15:44:34 +0100
committerJason Zaugg <jzaugg@gmail.com>2014-03-27 15:46:02 +0100
commitcf19f02966fc427be26404b7f8ddd5d05bfe3127 (patch)
treec3962002aecdbd1f49799433e87450b99b95a045 /src/main/scala/scala/async
parentee66e081ad0dec0e0c20fbb7e40fd20122bba238 (diff)
downloadscala-async-cf19f02966fc427be26404b7f8ddd5d05bfe3127.tar.gz
scala-async-cf19f02966fc427be26404b7f8ddd5d05bfe3127.tar.bz2
scala-async-cf19f02966fc427be26404b7f8ddd5d05bfe3127.zip
Incorporate pull request feedback
- remove unneeded `setType(NoType)`, which was leftover from my first attempts to find this bug. - fix typo in error message - optimize imports (cherry picked from commit 5c6ea29966fa80faae13892da50fc68ed1bf9ae7)
Diffstat (limited to 'src/main/scala/scala/async')
-rw-r--r--src/main/scala/scala/async/internal/AsyncAnalysis.scala2
-rw-r--r--src/main/scala/scala/async/internal/AsyncTransform.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
index 274603f..15ddf48 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(_) =>
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 beb828d..c8d2234 100644
--- a/src/main/scala/scala/async/internal/AsyncTransform.scala
+++ b/src/main/scala/scala/async/internal/AsyncTransform.scala
@@ -52,7 +52,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)