diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-10-05 11:35:33 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-10-05 11:35:33 +0200 |
| commit | 5435d2b11e9d23c50c5448b7623712f6e647c315 (patch) | |
| tree | b1fc98841d6c26171221e66a5d659b39d856bf65 /src/library | |
| parent | c3906917675b54e9ac1f248c9fb0fba9fa310f0e (diff) | |
| parent | bb3ded3826adbb52b23725a93d6d51fc127b5623 (diff) | |
| download | scala-5435d2b11e9d23c50c5448b7623712f6e647c315.tar.gz scala-5435d2b11e9d23c50c5448b7623712f6e647c315.tar.bz2 scala-5435d2b11e9d23c50c5448b7623712f6e647c315.zip | |
Merge commit 'bb3ded3' into merge-2.11-to-2.12-oct-5
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/concurrent/Future.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/sys/process/Process.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index 6304f35da9..c8ababbcab 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -610,7 +610,7 @@ object Future { def sequence[A, M[X] <: TraversableOnce[X]](in: M[Future[A]])(implicit cbf: CanBuildFrom[M[Future[A]], A, M[A]], executor: ExecutionContext): Future[M[A]] = { in.foldLeft(successful(cbf(in))) { (fr, fa) => for (r <- fr; a <- fa) yield (r += a) - } map (_.result()) + }.map(_.result())(InternalCallbackExecutor) } /** Asynchronously and non-blockingly returns a new `Future` to the result of the first future diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala index c40838bb06..06b9967908 100644 --- a/src/library/scala/sys/process/Process.scala +++ b/src/library/scala/sys/process/Process.scala @@ -68,7 +68,7 @@ trait ProcessCreation { /** Creates a [[scala.sys.process.ProcessBuilder]] with working dir set to `File` and extra * environment variables. * - * @example {{{ apply("java", new java.ioFile("/opt/app"), "CLASSPATH" -> "library.jar") }}} + * @example {{{ apply("java", new java.io.File("/opt/app"), "CLASSPATH" -> "library.jar") }}} */ def apply(command: String, cwd: File, extraEnv: (String, String)*): ProcessBuilder = apply(command, Some(cwd), extraEnv: _*) @@ -76,7 +76,7 @@ trait ProcessCreation { /** Creates a [[scala.sys.process.ProcessBuilder]] with working dir set to `File` and extra * environment variables. * - * @example {{{ apply("java" :: javaArgs, new java.ioFile("/opt/app"), "CLASSPATH" -> "library.jar") }}} + * @example {{{ apply("java" :: javaArgs, new java.io.File("/opt/app"), "CLASSPATH" -> "library.jar") }}} */ def apply(command: Seq[String], cwd: File, extraEnv: (String, String)*): ProcessBuilder = apply(command, Some(cwd), extraEnv: _*) |