From 77c1e3aaa10aa78e7841b03a674acdc22bb6f758 Mon Sep 17 00:00:00 2001
From: Philipp Krones <hello@philkrones.com>
Date: Thu, 2 Nov 2023 17:35:56 +0100
Subject: Merge commit '09ac14c901abc43bd0d617ae4a44e8a4fed98d9c' into clippyup

---
 clippy_dev/src/main.rs         | 1 -
 clippy_dev/src/new_lint.rs     | 4 ++--
 clippy_dev/src/update_lints.rs | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'clippy_dev')

diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs
index fca750fafc7..5bd9994e18d 100644
--- a/clippy_dev/src/main.rs
+++ b/clippy_dev/src/main.rs
@@ -199,7 +199,6 @@ fn get_clap_config() -> ArgMatches {
                             "cargo",
                             "nursery",
                             "internal",
-                            "internal_warn",
                         ]),
                     Arg::new("type").long("type").help("What directory the lint belongs in"),
                     Arg::new("msrv")
diff --git a/clippy_dev/src/new_lint.rs b/clippy_dev/src/new_lint.rs
index be2386bb1d2..eeea53ce46f 100644
--- a/clippy_dev/src/new_lint.rs
+++ b/clippy_dev/src/new_lint.rs
@@ -346,11 +346,11 @@ fn get_lint_declaration(name_upper: &str, category: &str) -> String {
                 /// ### Why is this bad?
                 ///
                 /// ### Example
-                /// ```rust
+                /// ```no_run
                 /// // example code where clippy issues a warning
                 /// ```
                 /// Use instead:
-                /// ```rust
+                /// ```no_run
                 /// // example code which does not raise clippy warning
                 /// ```
                 #[clippy::version = "{}"]
diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs
index 842aeed2aa4..6b76a44debf 100644
--- a/clippy_dev/src/update_lints.rs
+++ b/clippy_dev/src/update_lints.rs
@@ -588,7 +588,7 @@ impl Lint {
             .collect()
     }
 
-    /// Returns all internal lints (not `internal_warn` lints)
+    /// Returns all internal lints
     #[must_use]
     fn internal_lints(lints: &[Self]) -> Vec<Self> {
         lints.iter().filter(|l| l.group == "internal").cloned().collect()
-- 
cgit 1.4.1-3-g733a5