Auto merge of rust-lang#2348 - RalfJung:ui-test, r=RalfJung

ui_test: require colon after command

Turns out we already use colons everywhere properly.

Also rename ui_test::comments to parser. I think that better describes its contents. :)

Author: bors

ui_test/src/lib.rs

@@ -10,13 +10,13 @@ use std::sync::Mutex;
 pub use color_eyre;
 use color_eyre::eyre::Result;
 use colored::*;
-use comments::ErrorMatch;
+use parser::ErrorMatch;
 use regex::Regex;
 use rustc_stderr::{Level, Message};
 
-use crate::comments::{Comments, Condition};
+use crate::parser::{Comments, Condition};
 
-mod comments;
+mod parser;
 mod rustc_stderr;
 #[cfg(test)]
 mod tests;

ui_test/src/comments.rs ui_test/src/parser.rsui_test/src/comments.rs renamed to ui_test/src/parser.rs

@@ -117,12 +117,8 @@ impl Comments {
                     let next = args
                         .next()
                         .expect("the `position` above guarantees that there is at least one char");
-                    // FIXME: this replicates the existing flexibility in our syntax. Consider requiring the colon.
-                    let args = match next {
-                        ':' | ' ' => args.as_str(),
-                        _ => bail!("expected space or `:`, got `{next}`"),
-                    };
-                    (command, args.trim())
+                    ensure!(next == ':', "test command must be followed by : (or end the line)");
+                    (command, args.as_str().trim())
                 }
             };
 
@@ -188,16 +184,19 @@ impl Comments {
                 self.error_pattern = Some((args.trim().to_string(), l));
             }
             "stderr-per-bitwidth" => {
+                // args are ignored (can be used as comment)
                 ensure!(!self.stderr_per_bitwidth, "cannot specifiy stderr-per-bitwidth twice");
                 self.stderr_per_bitwidth = true;
             }
             command => {
                 if let Some(s) = command.strip_prefix("ignore-") {
+                    // args are ignored (can be sue as comment)
                     self.ignore.push(Condition::parse(s));
                     return Ok(());
                 }
 
                 if let Some(s) = command.strip_prefix("only-") {
+                    // args are ignored (can be sue as comment)
                     self.only.push(Condition::parse(s));
                     return Ok(());
                 }

ui_test/src/comments/tests.rs ui_test/src/parser/tests.rsui_test/src/comments/tests.rs renamed to ui_test/src/parser/tests.rs

@@ -53,3 +53,17 @@ use std::mem;
         Err(_) => Ok(()),
     }
 }
+
+#[test]
+fn missing_colon_fail() -> Result<()> {
+    init();
+    let s = r"
+//@stderr-per-bitwidth hello
+use std::mem;
+
+    ";
+    match Comments::parse(Path::new("<dummy>"), s) {
+        Ok(_) => bail!("expected parsing to fail"),
+        Err(_) => Ok(()),
+    }
+}