From 258edf77cc5a8af14dae06f1bf2d3e55bbf3df34 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 17 Apr 2013 17:42:00 +0200 Subject: Mark `await` as @compileTimeOnly Rather than as @deprecated. This commit means we can no longer build against 2.10.0. --- src/main/scala/scala/async/Async.scala | 4 ++-- src/test/scala/scala/async/neg/NakedAwait.scala | 2 +- 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) -- cgit v1.2.3