summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorswaldman <swaldman@mchange.com>2015-04-28 04:42:11 -0700
committerswaldman <swaldman@mchange.com>2015-04-28 04:42:11 -0700
commit6f0e4c64017e6504a3c8017a9322b5edbf73b79a (patch)
treeb006e0941159d9418fd3c0d0db414c73ee764cdc /src
parenteeba018f27487e161de93d93c01cb8b2d8132f8f (diff)
downloadscala-6f0e4c64017e6504a3c8017a9322b5edbf73b79a.tar.gz
scala-6f0e4c64017e6504a3c8017a9322b5edbf73b79a.tar.bz2
scala-6f0e4c64017e6504a3c8017a9322b5edbf73b79a.zip
Fixed documentation of assertions in Predef
Assertions can be elided at compile time; they generate no runtime conditional code and are in fact run unconditionally if not elided during compilation. Updated documentation to reflect that.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/Predef.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 42448b38f2..4eed672794 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -36,8 +36,8 @@ import scala.io.StdIn
*
* A set of `assert` functions are provided for use as a way to document
* and dynamically check invariants in code. `assert` statements can be elided
- * at runtime by providing the command line argument `-Xdisable-assertions` to
- * the `scala` command.
+ * at compile time by providing the command line argument `-Xdisable-assertions` to
+ * the `scalac` command.
*
* Variants of `assert` intended for use with static analysis tools are also
* provided: `assume`, `require` and `ensuring`. `require` and `ensuring` are