summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-13 21:16:29 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-13 21:16:29 -0700
commitac8c6e8f3a8f33d5987fc1fa320b3def5373a504 (patch)
tree6783329924abdab8672d0c13844b86ce1e427a86
parentae3e6ce9c5daf649fd60355024e89b249c14ecc3 (diff)
parent927f2f73b9746666e05ef026f491056c352fd755 (diff)
downloadscala-ac8c6e8f3a8f33d5987fc1fa320b3def5373a504.tar.gz
scala-ac8c6e8f3a8f33d5987fc1fa320b3def5373a504.tar.bz2
scala-ac8c6e8f3a8f33d5987fc1fa320b3def5373a504.zip
Merge pull request #5015 from janekdb/topic/2.12.x-scaladoc-elide-below-off-by-one-Predef
Scaladoc: Fix elidable threshold off-by-one comment and link elidable
-rw-r--r--src/library/scala/Predef.scala16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 50a53732f1..6f3fd1ba23 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -146,9 +146,9 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
/** Tests an expression, throwing an `AssertionError` if false.
* Calls to this method will not be generated if `-Xelide-below`
- * is at least `ASSERTION`.
+ * is greater than `ASSERTION`.
*
- * @see elidable
+ * @see [[scala.annotation.elidable elidable]]
* @param assertion the expression to test
*/
@elidable(ASSERTION)
@@ -159,9 +159,9 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
/** Tests an expression, throwing an `AssertionError` if false.
* Calls to this method will not be generated if `-Xelide-below`
- * is at least `ASSERTION`.
+ * is greater than `ASSERTION`.
*
- * @see elidable
+ * @see [[scala.annotation.elidable elidable]]
* @param assertion the expression to test
* @param message a String to include in the failure message
*/
@@ -175,9 +175,9 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
* This method differs from assert only in the intent expressed:
* assert contains a predicate which needs to be proven, while
* assume contains an axiom for a static checker. Calls to this method
- * will not be generated if `-Xelide-below` is at least `ASSERTION`.
+ * will not be generated if `-Xelide-below` is greater than `ASSERTION`.
*
- * @see elidable
+ * @see [[scala.annotation.elidable elidable]]
* @param assumption the expression to test
*/
@elidable(ASSERTION)
@@ -190,9 +190,9 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
* This method differs from assert only in the intent expressed:
* assert contains a predicate which needs to be proven, while
* assume contains an axiom for a static checker. Calls to this method
- * will not be generated if `-Xelide-below` is at least `ASSERTION`.
+ * will not be generated if `-Xelide-below` is greater than `ASSERTION`.
*
- * @see elidable
+ * @see [[scala.annotation.elidable elidable]]
* @param assumption the expression to test
* @param message a String to include in the failure message
*/