diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:26:34 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:26:34 -0700 |
commit | aea3cbc91b31f482c05e65c3fd1c1b50164eda16 (patch) | |
tree | 1a20d4e268be7c560c029f0d3dae8f196626a802 /src/library | |
parent | 0823aedaf38ecde794a7703d5b7c4c7562ed4ca6 (diff) | |
parent | b7c352a57f65458c66c78a368f75aaaa4a08e443 (diff) | |
download | scala-aea3cbc91b31f482c05e65c3fd1c1b50164eda16.tar.gz scala-aea3cbc91b31f482c05e65c3fd1c1b50164eda16.tar.bz2 scala-aea3cbc91b31f482c05e65c3fd1c1b50164eda16.zip |
Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-master
Merge v2.10.1-326-g4f8c306 into master
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/PartialFunction.scala | 2 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/Future.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/PartialFunction.scala b/src/library/scala/PartialFunction.scala index 7ff5a33586..9ff648a05a 100644 --- a/src/library/scala/PartialFunction.scala +++ b/src/library/scala/PartialFunction.scala @@ -81,7 +81,7 @@ trait PartialFunction[-A, +B] extends (A => B) { self => override def andThen[C](k: B => C): PartialFunction[A, C] = new AndThen[A, B, C] (this, k) - /** Turns this partial function into an plain function returning an `Option` result. + /** Turns this partial function into a plain function returning an `Option` result. * @see Function.unlift * @return a function that takes an argument `x` to `Some(this(x))` if `this` * is defined for `x`, and to `None` otherwise. diff --git a/src/library/scala/concurrent/impl/Future.scala b/src/library/scala/concurrent/impl/Future.scala index 055ce6e4fa..042d32c234 100644 --- a/src/library/scala/concurrent/impl/Future.scala +++ b/src/library/scala/concurrent/impl/Future.scala @@ -28,7 +28,7 @@ private[concurrent] object Future { def apply[T](body: =>T)(implicit executor: ExecutionContext): scala.concurrent.Future[T] = { val runnable = new PromiseCompletingRunnable(body) - executor.execute(runnable) + executor.prepare.execute(runnable) runnable.promise.future } } |