Auto merge of #2332 - rust-lang:slash_slash_at, r=oli-obk

More robust comment parsing

fixes #2170

I haven't ported the entire test suite yet. Once we've done that, I will remove the old parsing system (or in fact, turn them into errors so that accidental usage of old-style comments will be detected)

tests/compiletest.rs

@@ -2,13 +2,13 @@ use colored::*;
 use regex::Regex;
 use std::env;
 use std::path::PathBuf;
-use ui_test::{Config, Mode, OutputConflictHandling};
+use ui_test::{color_eyre::Result, Config, Mode, OutputConflictHandling};
 
 fn miri_path() -> PathBuf {
     PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
 }
 
-fn run_tests(mode: Mode, path: &str, target: Option<String>) {
+fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
     let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();
 
     // Add some flags we always want.
@@ -108,7 +108,7 @@ regexes! {
     "sys/[a-z]+/"                    => "sys/PLATFORM/",
 }
 
-fn ui(mode: Mode, path: &str) {
+fn ui(mode: Mode, path: &str) -> Result<()> {
     let target = get_target();
 
     let msg = format!(
@@ -117,20 +117,24 @@ fn ui(mode: Mode, path: &str) {
     );
     eprintln!("{}", msg.green().bold());
 
-    run_tests(mode, path, target);
+    run_tests(mode, path, target)
 }
 
 fn get_target() -> Option<String> {
     env::var("MIRI_TEST_TARGET").ok()
 }
 
-fn main() {
+fn main() -> Result<()> {
+    ui_test::color_eyre::install()?;
+
     // Add a test env var to do environment communication tests.
     env::set_var("MIRI_ENV_VAR_TEST", "0");
     // Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
     env::set_var("MIRI_TEMP", env::temp_dir());
 
-    ui(Mode::Pass, "tests/pass");
-    ui(Mode::Panic, "tests/panic");
-    ui(Mode::Fail, "tests/fail");
+    ui(Mode::Pass, "tests/pass")?;
+    ui(Mode::Panic, "tests/panic")?;
+    ui(Mode::Fail, "tests/fail")?;
+
+    Ok(())
 }

tests/fail/alloc/deallocate-bad-alignment.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-// error-pattern: has size 1 and alignment 1, but gave size 1 and alignment 2
+//@error-pattern: has size 1 and alignment 1, but gave size 1 and alignment 2
 
 fn main() {
     unsafe {

tests/fail/alloc/deallocate-bad-size.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-// error-pattern: has size 1 and alignment 1, but gave size 2 and alignment 1
+//@error-pattern: has size 1 and alignment 1, but gave size 2 and alignment 1
 
 fn main() {
     unsafe {

tests/fail/alloc/deallocate-twice.rs

@@ -1,6 +1,6 @@
 use std::alloc::{alloc, dealloc, Layout};
 
-// error-pattern: dereferenced after this allocation got freed
+//@error-pattern: dereferenced after this allocation got freed
 
 fn main() {
     unsafe {

tests/fail/alloc/global_system_mixup.rs

@@ -1,10 +1,10 @@
 // Make sure we detect when the `Global` and `System` allocators are mixed
 // (even when the default `Global` uses `System`).
-// error-pattern: which is Rust heap memory, using
+//@error-pattern: which is Rust heap memory, using
 
-// normalize-stderr-test: "using [A-Za-z]+ heap deallocation operation" -> "using PLATFORM heap deallocation operation"
-// normalize-stderr-test: "\| +\^+" -> "| ^"
-// normalize-stderr-test: "libc::free\([^()]*\)|unsafe \{ HeapFree\([^()]*\) \};" -> "FREE();"
+//@normalize-stderr-test: "using [A-Za-z]+ heap deallocation operation" -> "using PLATFORM heap deallocation operation"
+//@normalize-stderr-test: "\| +\^+" -> "| ^"
+//@normalize-stderr-test: "libc::free\([^()]*\)|unsafe \{ HeapFree\([^()]*\) \};" -> "FREE();"
 
 #![feature(allocator_api, slice_ptr_get)]