about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-02-20 01:13:27 +0800
committerkennytm <kennytm@gmail.com>2019-02-20 11:58:45 +0800
commit51445830d288607f4cf9639ea9c9a1765b85f992 (patch)
treee89b9fb9c5f53d93a54722ffa6ef1d673e47a025
parent7ef11d4f849004e36a61949cfd01cc1a46fac75a (diff)
parent8fbb013c1c0605a4738a6f5f5ec5b47550a2a5ec (diff)
downloadrust-51445830d288607f4cf9639ea9c9a1765b85f992.tar.gz
rust-51445830d288607f4cf9639ea9c9a1765b85f992.zip
Rollup merge of #58534 - dwijnand:mention-capping-forbid-lints, r=oli-obk
Mention capping forbid lints

I felt the description of forbid was misleading/incomplete without
mentioning how --cap-lints interacts with it.
-rw-r--r--src/doc/rustc/src/lints/levels.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doc/rustc/src/lints/levels.md b/src/doc/rustc/src/lints/levels.md
index 072c7585934..d315e0f8ca9 100644
--- a/src/doc/rustc/src/lints/levels.md
+++ b/src/doc/rustc/src/lints/levels.md
@@ -90,7 +90,9 @@ This lint level gives you that.
 'forbid' is a special lint level that's stronger than 'deny'. It's the same
 as 'deny' in that a lint at this level will produce an error, but unlike the
 'deny' level, the 'forbid' level can not be overridden to be anything lower
-than an error.
+than an error.  However, lint levels may still be capped with `--cap-lints`
+(see below) so `rustc --cap-lints warn` will make lints set to 'forbid' just
+warn.
 
 ## Configuring warning levels