summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-10-06 10:09:45 -0400
committerSeth Tisue <seth@tisue.net>2015-10-06 10:09:45 -0400
commit5614baf08b2da56532b580c7e2f70cf357832970 (patch)
tree7553dd0f32f0ce00e6678463a11d2db06f33ede3
parent4cbf89fa4408942ca38815e946f1e02ab913c3ad (diff)
parentadfeef16c4220e930e1d245ddc88f89b93c52e9f (diff)
downloadscala-5614baf08b2da56532b580c7e2f70cf357832970.tar.gz
scala-5614baf08b2da56532b580c7e2f70cf357832970.tar.bz2
scala-5614baf08b2da56532b580c7e2f70cf357832970.zip
Merge pull request #4787 from lrytz/implicitAmbiguousDoc
Minor fixes to Scaladoc of implicitAmbiguous
-rw-r--r--src/library/scala/annotation/implicitAmbiguous.scala14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/library/scala/annotation/implicitAmbiguous.scala b/src/library/scala/annotation/implicitAmbiguous.scala
index 46eab9ae8f..f190865623 100644
--- a/src/library/scala/annotation/implicitAmbiguous.scala
+++ b/src/library/scala/annotation/implicitAmbiguous.scala
@@ -3,14 +3,14 @@ package scala.annotation
import scala.annotation.meta._
/**
- * To customize the error message that's emitted when an implicit of type
- * C[T1,..., TN] is found more than once, annotate the class C
- * with @implicitAmbiguous. Assuming C has type parameters X1,..., XN, the
- * error message will be the result of replacing all occurrences of ${Xi} in
- * the string msg with the string representation of the corresponding type
- * argument Ti. *
+ * To customize the error message that's emitted when an implicit search finds
+ * multiple ambiguous values, annotate at least one of the implicit values
+ * `@implicitAmbiguous`. Assuming the implicit value is a method with type
+ * parameters `X1,..., XN`, the error message will be the result of replacing
+ * all occurrences of `${Xi}` in the string `msg` with the string representation
+ * of the corresponding type argument `Ti`.
*
- * If more than one @implicitAmbiguous annotation is collected, the compiler is
+ * If more than one `@implicitAmbiguous` annotation is collected, the compiler is
* free to pick any of them to display.
*
* Nice errors can direct users to fix imports or even tell them why code