summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-09 06:11:46 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-09 06:11:46 -0800
commitaefe3fb844b9ae81068867f4aa19df5f96cd462f (patch)
tree46473733df7e5b6d2fa04734fec70a06de048d42 /src
parent1f2cd7e5120bb22b14ad81adf8fb09caa5af2853 (diff)
parentbd4adf5c97bdebca47923a919c07f4363838be83 (diff)
downloadscala-aefe3fb844b9ae81068867f4aa19df5f96cd462f.tar.gz
scala-aefe3fb844b9ae81068867f4aa19df5f96cd462f.tar.bz2
scala-aefe3fb844b9ae81068867f4aa19df5f96cd462f.zip
Merge pull request #3344 from jamesward/fix/ec-implicit-error
More clear implicitNotFound error for ExecutionContext
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 8928724b34..b4af161c3c 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -16,7 +16,7 @@ import scala.util.Try
/**
* An `ExecutionContext` is an abstraction over an entity that can execute program logic.
*/
-@implicitNotFound("Cannot find an implicit ExecutionContext, either require one yourself or import ExecutionContext.Implicits.global")
+@implicitNotFound("Cannot find an implicit ExecutionContext, either import scala.concurrent.ExecutionContext.Implicits.global or use a custom one")
trait ExecutionContext {
/** Runs a block of code on this execution context.