From f9a65afb27e0093b56053f810952efcba3e718e5 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 25 Sep 2020 14:04:10 +0200
Subject: [PATCH] Make invalid_html_tags lint only run on nightly and being
 allowed by default

---
 compiler/rustc_session/src/lint/builtin.rs |  2 +-
 src/doc/rustdoc/src/lints.md               |  6 ++++--
 src/librustdoc/passes/html_tags.rs         | 11 +++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/compiler/rustc_session/src/lint/builtin.rs b/compiler/rustc_session/src/lint/builtin.rs
index ce2a14b4481..164df22c5c3 100644
--- 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 d6ae665ba05..d8c0bab2259 100644
--- 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 0cffaee1c4e..1b48ce622b1 100644
--- 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] = &[
-- 
2.44.0