diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
| commit | 630bcc3e917179ff9d415513106e5b4e5065d4fb (patch) | |
| tree | 6e0a59354c15ebfd499b342b62e9e0e008e5fa4d /src/library/scala/Predef.scala | |
| parent | 0bcd0a40dcfda091bbb665b5f0879d9ce3384ab5 (diff) | |
| parent | 1b7e660f74223a847b307613a8ab200923433b13 (diff) | |
| download | scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.gz scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.bz2 scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.zip | |
Merge commit '1b7e660' into merge-2.11-may-12
Diffstat (limited to 'src/library/scala/Predef.scala')
| -rw-r--r-- | src/library/scala/Predef.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 3cc83654b7..0914bcefa3 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -35,9 +35,9 @@ import scala.io.StdIn * === Assertions === * * 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. + * and dynamically check invariants in code. Invocations of `assert` can be elided + * at compile time by providing the command line option `-Xdisable-assertions`, + * which raises `-Xelide-below` above `elidable.ASSERTION`, 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 |