diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 14:59:10 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-12 15:01:52 +0100 |
| commit | d43d5e5e22e61061cd84ab8b69b237249a519994 (patch) | |
| tree | de0f61f48b41e499001dabc6c8be314b2a08dd31 | |
| parent | 5a4b555c378d79d57b59dfd6edafd2b9a59866bb (diff) | |
| download | scala-d43d5e5e22e61061cd84ab8b69b237249a519994.tar.gz scala-d43d5e5e22e61061cd84ab8b69b237249a519994.tar.bz2 scala-d43d5e5e22e61061cd84ab8b69b237249a519994.zip | |
Changing trait CanBlock name to CanAwait.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/library/scala/concurrent/ExecutionContext.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/concurrent/Future.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/concurrent/package.scala | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index d392f0e82c..d38fbff32c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ *.jar +build +*.*~ +*~ +.gitignore 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 { } } + + |