Move the clippy_ci_panic_test integration into a regular test

.github/workflows/clippy_mq.yml

@@ -147,7 +147,6 @@ jobs:
       max-parallel: 6
       matrix:
         integration:
-        - 'matthiaskrgr/clippy_ci_panic_test'
         - 'rust-lang/cargo'
         - 'rust-lang/chalk'
         - 'rust-lang/rustfmt'

clippy_lints_internal/src/lib.rs

@@ -29,7 +29,6 @@ mod internal_paths;
 mod lint_without_lint_pass;
 mod msrv_attr_impl;
 mod outer_expn_data_pass;
-mod produce_ice;
 mod repeated_is_diagnostic_item;
 mod symbols;
 mod unnecessary_def_path;
@@ -47,7 +46,6 @@ static LINTS: &[&Lint] = &[
     lint_without_lint_pass::MISSING_CLIPPY_VERSION_ATTRIBUTE,
     msrv_attr_impl::MISSING_MSRV_ATTR_IMPL,
     outer_expn_data_pass::OUTER_EXPN_EXPN_DATA,
-    produce_ice::PRODUCE_ICE,
     symbols::INTERNING_LITERALS,
     symbols::SYMBOL_AS_STR,
     unnecessary_def_path::UNNECESSARY_DEF_PATH,
@@ -61,7 +59,6 @@ pub fn register_lints(store: &mut LintStore) {
     store.register_early_lint_pass(Box::new(|| {
         Box::new(unsorted_clippy_utils_paths::UnsortedClippyUtilsPaths)
     }));
-    store.register_early_lint_pass(Box::new(|| Box::new(produce_ice::ProduceIce)));
     store.register_late_lint_pass(Box::new(|_| Box::new(collapsible_span_lint_calls::CollapsibleCalls)));
     store.register_late_lint_pass(Box::new(|_| Box::<symbols::Symbols>::default()));
     store.register_late_lint_pass(Box::new(|_| {

tests/integration.rs

@@ -61,26 +61,6 @@ fn integration_test() {
     // debug:
     eprintln!("{stderr}");
 
-    // this is an internal test to make sure we would correctly panic on a span_delayed_bug
-    if repo_name == "matthiaskrgr/clippy_ci_panic_test" {
-        // we need to kind of switch around our logic here:
-        // if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing
-
-        // the repo basically just contains a span_delayed_bug that forces rustc/clippy to panic:
-        /*
-           #![feature(rustc_attrs)]
-           #[rustc_error(delayed_bug_from_inside_query)]
-           fn main() {}
-        */
-
-        if stderr.find("error: internal compiler error").is_some() {
-            eprintln!("we saw that we intentionally panicked, yay");
-            return;
-        }
-
-        panic!("panic caused by span_delayed_bug was NOT detected! Something is broken!");
-    }
-
     if let Some(backtrace_start) = stderr.find("error: internal compiler error") {
         static BACKTRACE_END_MSG: &str = "end of query stack";
         let backtrace_end = stderr[backtrace_start..]

tests/ui/custom_ice_message.rs

@@ -0,0 +1,13 @@
+//@rustc-env:RUST_BACKTRACE=0
+//@normalize-stderr-test: "Clippy version: .*" -> "Clippy version: foo"
+//@normalize-stderr-test: "custom_ice_message.rs:\d*:\d*" -> "custom_ice_message.rs"
+//@normalize-stderr-test: "rustc 1\.\d+.* running on .*" -> "rustc <version> running on <target>"
+//@normalize-stderr-test: "(?ms)query stack during panic:\n.*end of query stack\n" -> ""
+//@normalize-stderr-test: "note: delayed at .*" -> "note: delayed at <location>"
+//@normalize-stderr-test: "note: compiler flags: .*" -> "note: compiler flags: <flags>"
+
+#![feature(rustc_attrs)]
+
+#[rustc_delayed_bug_from_inside_query]
+fn main() {}
+//~^ ice: delayed bug triggered by

tests/ui/custom_ice_message.stderr

@@ -0,0 +1,24 @@
+note: no errors encountered even though delayed bugs were created
+
+note: those delayed bugs will now be shown as internal compiler errors
+
+error: internal compiler error: delayed bug triggered by #[rustc_delayed_bug_from_inside_query]
+  --> tests/ui/custom_ice_message.rs
+   |
+LL | fn main() {}
+   | ^^^^^^^^^
+   |
+note: delayed at <location>
+  --> tests/ui/custom_ice_message.rs
+   |
+LL | fn main() {}
+   | ^^^^^^^^^
+
+note: using internal features is not supported and expected to cause internal compiler errors when used incorrectly
+
+note: rustc <version> running on <target>
+
+note: compiler flags: <flags>
+
+note: Clippy version: foo
+