compiletest: Require //~ annotations even if error-pattern is specified

Author: petrochenkov

src/doc/rustc-dev-guide/src/tests/ui.md

@@ -169,16 +169,9 @@ impl TestCx<'_> {
             self.props.error_patterns
         );
 
-        let check_patterns = should_run == WillExecute::No
-            && (!self.props.error_patterns.is_empty()
-                || !self.props.regex_error_patterns.is_empty());
         if !explicit && self.config.compare_mode.is_none() {
-            let check_annotations = !check_patterns || !expected_errors.is_empty();
-
-            if check_annotations {
-                // "//~ERROR comments"
-                self.check_expected_errors(expected_errors, &proc_res);
-            }
+            // "//~ERROR comments"
+            self.check_expected_errors(expected_errors, &proc_res);
         } else if explicit && !expected_errors.is_empty() {
             let msg = format!(
                 "line {}: cannot combine `--error-format` with {} annotations; use `error-pattern` instead",
@@ -188,7 +181,10 @@ impl TestCx<'_> {
             self.fatal(&msg);
         }
         let output_to_check = self.get_output(&proc_res);
-        if check_patterns {
+        if should_run == WillExecute::No
+            && (!self.props.error_patterns.is_empty()
+                || !self.props.regex_error_patterns.is_empty())
+        {
             // "// error-pattern" comments
             self.check_all_error_patterns(&output_to_check, &proc_res, pm);
         }

src/tools/compiletest/src/runtest/ui.rs

@@ -1,6 +1,7 @@
 // test the behavior of the --no-run flag without the --test flag
 
 //@ compile-flags:-Z unstable-options --no-run --test-args=--test-threads=1
-//@ error-pattern: the `--test` flag must be passed
 
 pub fn f() {}
+
+//~? ERROR the `--test` flag must be passed to enable `--no-run`

tests/rustdoc-ui/doctest/no-run-flag-error.rs

@@ -1,3 +1,4 @@
 //@ compile-flags:--theme {{src-base}}/invalid-theme-name.rs
-//@ error-pattern: invalid argument
 //@ error-pattern: must have a .css extension
+
+//~? ERROR invalid argument: "$DIR/invalid-theme-name.rs"

tests/rustdoc-ui/invalid-theme-name.rs

@@ -1,3 +1,4 @@
 //@ check-pass
 //@ compile-flags: --passes list
-//@ error-pattern: the `passes` flag no longer functions
+
+//~? WARN the `passes` flag no longer functions

tests/rustdoc-ui/issues/issue-91713.rs

@@ -1,6 +1,7 @@
-//@ error-pattern: no documentation found
 //@ normalize-stderr: "nightly|beta|1\.[0-9][0-9]\.[0-9]" -> "$$CHANNEL"
 #![deny(rustdoc::missing_crate_level_docs)]
 //^~ NOTE defined here
 
 pub fn foo() {}
+
+//~? ERROR no documentation found for this crate's top-level module

tests/rustdoc-ui/lints/no-crate-level-doc-lint.rs

@@ -3,7 +3,7 @@ error: no documentation found for this crate's top-level module
    = help: The following guide may be of use:
            https://doc.rust-lang.org/$CHANNEL/rustdoc/how-to-write-documentation.html
 note: the lint level is defined here
-  --> $DIR/no-crate-level-doc-lint.rs:3:9
+  --> $DIR/no-crate-level-doc-lint.rs:2:9
    |
 LL | #![deny(rustdoc::missing_crate_level_docs)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/rustdoc-ui/lints/no-crate-level-doc-lint.stderr

@@ -8,4 +8,4 @@
 struct A;
 struct B;
 
-pub const S: A = B;
+pub const S: A = B; //~ ERROR mismatched types

tests/rustdoc-ui/track-diagnostics.rs

@@ -1,6 +1,6 @@
 // Test that we get the following hint when trying to use a compiler crate without rustc_driver.
 //@ error-pattern: try adding `extern crate rustc_driver;` at the top level of this crate
-//@ compile-flags: --emit link
+//@ compile-flags: --emit link --error-format=human
 //@ normalize-stderr: ".*crate .* required.*\n\n" -> ""
 //@ normalize-stderr: "aborting due to [0-9]+" -> "aborting due to NUMBER"
 

tests/ui-fulldeps/missing-rustc-driver-error.rs

@@ -23,3 +23,5 @@
 
 #[lang = "sized"]
 trait Sized {}
+
+//~? ERROR the `-Zfixed-x18` flag is not supported on the `