Changing trait CanBlock name to CanAwait.

Author: aleksandar

.gitignore

@@ -1 +1,5 @@
 *.jar
+build
+*.*~
+*~
+.gitignore

src/library/scala/concurrent/ExecutionContext.scala

@@ -28,6 +28,6 @@ trait ExecutionContext {
 }
 
 
-sealed trait CanBlock
+sealed trait CanAwait
 
 

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)

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 {
   }
 
 }
+
+