From d43d5e5e22e61061cd84ab8b69b237249a519994 Mon Sep 17 00:00:00 2001 From: aleksandar Date: Thu, 12 Jan 2012 14:59:10 +0100 Subject: Changing trait CanBlock name to CanAwait. --- src/library/scala/concurrent/ExecutionContext.scala | 2 +- src/library/scala/concurrent/Future.scala | 2 +- src/library/scala/concurrent/package.scala | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/library') diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala index b7b3e901e6..2de080a822 100644 --- a/src/library/scala/concurrent/ExecutionContext.scala +++ b/src/library/scala/concurrent/ExecutionContext.scala @@ -28,6 +28,6 @@ trait ExecutionContext { } -sealed trait CanBlock +sealed trait CanAwait diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index 36126056c9..dff1adb45c 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -161,7 +161,7 @@ self => } this } - def await(timeout: Timeout)(implicit canblock: CanBlock): Throwable = { + def await(timeout: Timeout)(implicit canawait: CanAwait): Throwable = { var t: Throwable = null try { val res = self.await(timeout) diff --git a/src/library/scala/concurrent/package.scala b/src/library/scala/concurrent/package.scala index 33e1b65993..61137fbc6e 100644 --- a/src/library/scala/concurrent/package.scala +++ b/src/library/scala/concurrent/package.scala @@ -68,7 +68,7 @@ package object concurrent { * - TimeoutException - in the case that the blockable object timed out */ def await[T](timeout: Timeout)(body: =>T): T = await(timeout, new Awaitable[T] { - def await(timeout: Timeout)(implicit cb: CanBlock) = body + def await(timeout: Timeout)(implicit cb: CanAwait) = body }) /** Blocks on a blockable object. @@ -104,3 +104,5 @@ package concurrent { } } + + -- cgit v1.2.3