Auto merge of #51956 - GuillaumeGomez:shutdown-doc-lints, r=oli-obk

[rust.git] / src / librustc / lint / levels.rs

diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs
index 5bf15b10715c4a68ddeb7fc76b1b6410ee61b550..a1b84a7b716efdf4d4c9ea750bb34da9db858911 100644 (file)
--- a/src/librustc/lint/levels.rs
+++ b/src/librustc/lint/levels.rs
@@ -119,6 +119,11 @@ fn get_lint_level(&self,
         // Ensure that we never exceed the `--cap-lints` argument.
         level = cmp::min(level, self.lint_cap);
 
+        if let Some(driver_level) = sess.driver_lint_caps.get(&LintId::of(lint)) {
+            // Ensure that we never exceed driver level.
+            level = cmp::min(*driver_level, level);
+        }
+
         return (level, src)
     }