diff options
author | Seth Tisue <seth@tisue.net> | 2018-02-27 15:45:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-27 15:45:26 -0800 |
commit | b906b355af2f01953133fd8ae4681b0ca3462b25 (patch) | |
tree | ffc65617f3a92c7bd251b5f441de4e598d52038b /src/test/scala/scala/async/run/ifelse1/IfElse1.scala | |
parent | e5cde43baaf34b5479314b7a0904a95a255d3846 (diff) | |
parent | 58e7e33ea3d0b2841c610fdf218da0d0fcc53f3a (diff) | |
download | scala-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/ifelse1/IfElse1.scala')
-rw-r--r-- | src/test/scala/scala/async/run/ifelse1/IfElse1.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala index 46fb57d..855f767 100644 --- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala +++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala @@ -7,7 +7,7 @@ package run package ifelse1 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 @@ -17,7 +17,7 @@ class TestIfElse1Class { import ExecutionContext.Implicits.global - def base(x: Int): Future[Int] = future { + def base(x: Int): Future[Int] = Future { x + 2 } |