about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-12-29 16:07:22 +0000
committerbors <bors@rust-lang.org>2021-12-29 16:07:22 +0000
commitdf96fb166f59431e3de443835e50d5b8a7a4adb0 (patch)
tree0a0f76eeeaea023e599d98cf4bf148d68c89f345
parent2b67c30bfece00357d5fc09d99b49f21066f04ba (diff)
parent4d6bb4d8816db9bb2c5a519eef4692d48dde4e76 (diff)
downloadrust-df96fb166f59431e3de443835e50d5b8a7a4adb0.tar.gz
rust-df96fb166f59431e3de443835e50d5b8a7a4adb0.zip
Auto merge of #92309 - ehuss:remove-check_lines, r=Mark-Simulacrum
compiletest: Remove some vestigial code

The `check_lines` header is no longer parsed as a header, but instead inside the debuginfo tests. I believe this was changed in #13726.
-rw-r--r--src/tools/compiletest/src/header.rs11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 5fcaa452ca3..27d59bc01f2 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -78,8 +78,6 @@ pub struct TestProps {
     pub unset_rustc_env: Vec<String>,
     // Environment settings to use during execution
     pub exec_env: Vec<(String, String)>,
-    // Lines to check if they appear in the expected debugger output
-    pub check_lines: Vec<String>,
     // Build documentation for all specified aux-builds as well
     pub build_aux_docs: bool,
     // Flag to force a crate to be built with the host architecture
@@ -165,7 +163,6 @@ impl TestProps {
             rustc_env: vec![],
             unset_rustc_env: vec![],
             exec_env: vec![],
-            check_lines: vec![],
             build_aux_docs: false,
             force_host: false,
             check_stdout: false,
@@ -318,10 +315,6 @@ impl TestProps {
                     self.unset_rustc_env.push(ev);
                 }
 
-                if let Some(cl) = config.parse_check_line(ln) {
-                    self.check_lines.push(cl);
-                }
-
                 if let Some(of) = config.parse_forbid_output(ln) {
                     self.forbid_output.push(of);
                 }
@@ -555,10 +548,6 @@ impl Config {
         self.parse_name_value_directive(line, "run-flags")
     }
 
-    fn parse_check_line(&self, line: &str) -> Option<String> {
-        self.parse_name_value_directive(line, "check")
-    }
-
     fn parse_force_host(&self, line: &str) -> bool {
         self.parse_name_directive(line, "force-host")
     }