aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-04-20 13:20:56 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-04-20 13:20:56 -0700
commitde3c0b61184b37525ca8dca829290fa19d2aca3a (patch)
treeee419f69f311e0fc06030d7dd1cb067cc882a214
parent757930193a0a2225f4c5f35f449615a81d3aaf19 (diff)
parent258edf77cc5a8af14dae06f1bf2d3e55bbf3df34 (diff)
downloadscala-async-de3c0b61184b37525ca8dca829290fa19d2aca3a.tar.gz
scala-async-de3c0b61184b37525ca8dca829290fa19d2aca3a.tar.bz2
scala-async-de3c0b61184b37525ca8dca829290fa19d2aca3a.zip
Merge pull request #12 from retronym/topic/compile-time-only
Mark `await` as @compileTimeOnly
-rw-r--r--src/main/scala/scala/async/Async.scala4
-rw-r--r--src/test/scala/scala/async/neg/NakedAwait.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index 5a71ebe..35d3687 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -6,6 +6,7 @@ package scala.async
import scala.language.experimental.macros
import scala.reflect.macros.Context
+import scala.reflect.internal.annotations.compileTimeOnly
object Async extends AsyncBase {
@@ -56,8 +57,7 @@ abstract class AsyncBase {
* @tparam T the type of that value.
* @return the value.
*/
- // TODO Replace with `@compileTimeOnly when this is implemented SI-6539
- @deprecated("`await` must be enclosed in an `async` block", "0.1")
+ @compileTimeOnly("`await` must be enclosed in an `async` block")
def await[T](awaitable: futureSystem.Fut[T]): T = ???
protected[async] def fallbackEnabled = false
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index c3537ec..b0d5fde 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -13,7 +13,7 @@ import org.junit.Test
class NakedAwait {
@Test
def `await only allowed in async neg`() {
- expectError("`await` must be enclosed in an `async` block", "-deprecation -Xfatal-warnings") {
+ expectError("`await` must be enclosed in an `async` block") {
"""
| import _root_.scala.async.Async._
| await[Any](null)