Make invalid_html_tags lint only run on nightly and being allowed by default

diff --git a/compiler/rustc_session/src/lint/builtin.rs b/compiler/rustc_session/src/lint/builtin.rs
index ce2a14b448149dd856cd646675a5cce8714d7427..164df22c5c3d17f76275cee2ed312fa8f20d7f84 100644 (file)
--- a/compiler/rustc_session/src/lint/builtin.rs
+++ b/compiler/rustc_session/src/lint/builtin.rs
@@ -1887,7 +1887,7 @@
     ///
     /// [rustdoc book]: ../../../rustdoc/lints.html#invalid_html_tags
     pub INVALID_HTML_TAGS,
-    Warn,
+    Allow,
     "detects invalid HTML tags in doc comments"
 }
 

diff --git a/src/doc/rustdoc/src/lints.md b/src/doc/rustdoc/src/lints.md
index d6ae665ba05b3ec3b515d8e75314e549d4387a3f..d8c0bab22594305c3ce49ec480396c7b64ce9e28 100644 (file)
--- a/src/doc/rustdoc/src/lints.md
+++ b/src/doc/rustdoc/src/lints.md
@@ -253,10 +253,12 @@ typo mistakes for some common attributes.
 
 ## invalid_html_tags
 
-This lint **warns by default**. It detects unclosed or invalid HTML tags.
-For example:
+This lint is **allowed by default** and is **nightly-only**. It detects unclosed
+or invalid HTML tags. For example:
 
 ```rust
+#![warn(invalid_html_tags)]
+
 /// <h1>
 /// </script>
 pub fn foo() {}

diff --git a/src/librustdoc/passes/html_tags.rs b/src/librustdoc/passes/html_tags.rs
index 0cffaee1c4e99f8de64f5041d8b24902a3c8a4c7..1b48ce622b1f2511f639fb5841d1fc4e8cb56a65 100644 (file)
--- a/src/librustdoc/passes/html_tags.rs
+++ b/src/librustdoc/passes/html_tags.rs
@@ -5,9 +5,8 @@
 use crate::html::markdown::opts;
 use core::ops::Range;
 use pulldown_cmark::{Event, Parser};
-// use rustc_hir::hir_id::HirId;
+use rustc_feature::UnstableFeatures;
 use rustc_session::lint;
-// use rustc_span::Span;
 
 pub const CHECK_INVALID_HTML_TAGS: Pass = Pass {
     name: "check-invalid-html-tags",
@@ -26,9 +25,13 @@ fn new(cx: &'a DocContext<'tcx>) -> Self {
 }
 
 pub fn check_invalid_html_tags(krate: Crate, cx: &DocContext<'_>) -> Crate {
-    let mut coll = InvalidHtmlTagsLinter::new(cx);
+    if !UnstableFeatures::from_environment().is_nightly_build() {
+        krate
+    } else {
+        let mut coll = InvalidHtmlTagsLinter::new(cx);
 
-    coll.fold_crate(krate)
+        coll.fold_crate(krate)
+    }
 }
 
 const ALLOWED_UNCLOSED: &[&str] = &[