compiletest: Use DirectiveLine also for debuginfo (read: debugger) tests

This not only reduces code duplication already, it also gives us
revision parsing for free which we need in upcoming commits.

Long term we should probably use newtypes to avoid mixing up zero-based
and one-based line numbers. For now, rename var name to
`zero_based_line_no` to make things slightly clearer. `check_lines`
uses zero-based, but `DirectiveLine` use one-based.

Author: Enselic

src/tools/compiletest/src/directives.rs

@@ -28,7 +28,7 @@ mod cfg;
 mod directive_names;
 mod file;
 mod handlers;
-mod line;
+pub(crate) mod line;
 mod needs;
 #[cfg(test)]
 mod tests;

src/tools/compiletest/src/runtest/debugger.rs

@@ -28,7 +28,7 @@ impl DebuggerCommands {
         let mut check_lines = vec![];
         let mut counter = 0;
         let reader = BufReader::new(File::open(file.as_std_path()).unwrap());
-        for (line_no, line) in reader.lines().enumerate() {
+        for (zero_based_line_no, line) in reader.lines().enumerate() {
             counter += 1;
             let line = line.map_err(|e| format!("Error while parsing debugger commands: {}", e))?;
 
@@ -38,15 +38,21 @@ impl DebuggerCommands {
                 continue;
             }
 
-            let Some(line) = line.trim_start().strip_prefix("//@").map(str::trim_start) else {
+            let Some(directive) =
+                crate::directives::line::line_directive(file, zero_based_line_no + 1, &line)
+            else {
                 continue;
             };
 
-            if let Some(command) = parse_name_value(&line, &command_directive) {
-                commands.push(command);
+            if directive.name == command_directive
+                && let Some(command) = directive.value_after_colon()
+            {
+                commands.push(command.to_string());
             }
-            if let Some(pattern) = parse_name_value(&line, &check_directive) {
-                check_lines.push((line_no, pattern));
+            if directive.name == check_directive
+                && let Some(check) = directive.value_after_colon()
+            {
+                check_lines.push((zero_based_line_no, check.to_string()));
             }
         }
 
@@ -105,18 +111,6 @@ impl DebuggerCommands {
     }
 }
 
-/// Split off from the main `parse_name_value_directive`, so that improvements
-/// to directive handling aren't held back by debuginfo test commands.
-fn parse_name_value(line: &str, name: &str) -> Option<String> {
-    if let Some(after_name) = line.strip_prefix(name)
-        && let Some(value) = after_name.strip_prefix(':')
-    {
-        Some(value.to_owned())
-    } else {
-        None
-    }
-}
-
 /// Check that the pattern in `check_line` applies to `line`. Returns `true` if they do match.
 fn check_single_line(line: &str, check_line: &str) -> bool {
     // Allow check lines to leave parts unspecified (e.g., uninitialized