aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/scala/async/run/await0
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2018-02-27 15:45:26 -0800
committerGitHub <noreply@github.com>2018-02-27 15:45:26 -0800
commitb906b355af2f01953133fd8ae4681b0ca3462b25 (patch)
treeffc65617f3a92c7bd251b5f441de4e598d52038b /src/test/scala/scala/async/run/await0
parente5cde43baaf34b5479314b7a0904a95a255d3846 (diff)
parent58e7e33ea3d0b2841c610fdf218da0d0fcc53f3a (diff)
downloadscala-async-b906b355af2f01953133fd8ae4681b0ca3462b25.tar.gz
scala-async-b906b355af2f01953133fd8ae4681b0ca3462b25.tar.bz2
scala-async-b906b355af2f01953133fd8ae4681b0ca3462b25.zip
Merge pull request #188 from NthPortal/future-fixes
Remove uses of deprecated Future APIs
Diffstat (limited to 'src/test/scala/scala/async/run/await0')
-rw-r--r--src/test/scala/scala/async/run/await0/Await0Spec.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
index 7cc4095..e8190c7 100644
--- a/src/test/scala/scala/async/run/await0/Await0Spec.scala
+++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -12,7 +12,7 @@ package await0
import language.{reflectiveCalls, postfixOps}
-import scala.concurrent.{Future, ExecutionContext, future, Await}
+import scala.concurrent.{Future, ExecutionContext, Await}
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import org.junit.Test
@@ -21,23 +21,23 @@ class Await0Class {
import ExecutionContext.Implicits.global
- def m1(x: Double): Future[Double] = future {
+ def m1(x: Double): Future[Double] = Future {
x + 2.0
}
- def m2(x: Float): Future[Float] = future {
+ def m2(x: Float): Future[Float] = Future {
x + 2.0f
}
- def m3(x: Char): Future[Char] = future {
+ def m3(x: Char): Future[Char] = Future {
(x.toInt + 2).toChar
}
- def m4(x: Short): Future[Short] = future {
+ def m4(x: Short): Future[Short] = Future {
(x + 2).toShort
}
- def m5(x: Byte): Future[Byte] = future {
+ def m5(x: Byte): Future[Byte] = Future {
(x + 2).toByte
}