diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 22:06:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 09:19:19 +1000 |
| commit | da46355a90442636ee7634c31a69eae8e8b9cd42 (patch) | |
| tree | eec9abbf057e3c5fd4566df6628f9693835cc536 /test/files/jvm | |
| parent | 74e53cb4930fc3e02222d8be0f065ce8aaa71230 (diff) | |
| parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
| download | scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.gz scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.bz2 scala-da46355a90442636ee7634c31a69eae8e8b9cd42.zip | |
Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203
Conflicts:
build.sbt
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/future-spec/FutureTests.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala index abcf1b4cbc..d0de2f5542 100644 --- a/test/files/jvm/future-spec/FutureTests.scala +++ b/test/files/jvm/future-spec/FutureTests.scala @@ -238,7 +238,7 @@ class FutureTests extends MinimalScalaTest { "support pattern matching within a for-comprehension" in { case class Req[T](req: T) case class Res[T](res: T) - def async[T](req: Req[T]) = req match { + def async[T](req: Req[T]) = (req: @unchecked) match { case Req(s: String) => Future { Res(s.length) } case Req(i: Int) => Future { Res((i * 2).toString) } } |