Fix annotation filtering with revisions

Author: oli-obk

tests/compiletest.rs

@@ -106,8 +106,6 @@ regexes! {
     "[^ `]*/(rust[^/]*|checkout)/library/" => "RUSTLIB/",
     // erase platform file paths
     "sys/[a-z]+/"                    => "sys/PLATFORM/",
-    // erase error annotations
-    "//(\\[[a-z,]+\\])?~.*"                    => "",
 }
 
 fn ui(mode: Mode, path: &str) -> Result<()> {

tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

@@ -4,8 +4,8 @@ error: abnormal termination: the program aborted execution
   --> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
    |
 LL | / extern "C-unwind" fn nounwind() {
-LL | |     
-LL | |     
+LL | |
+LL | |
 LL | |     panic!();
 LL | | }
    | |_^ the program aborted execution

tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

@@ -4,8 +4,8 @@ error: abnormal termination: the program aborted execution
   --> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
    |
 LL | / extern "C-unwind" fn nounwind() {
-LL | |     
-LL | |     
+LL | |
+LL | |
 LL | |     panic!();
 LL | | }
    | |_^ the program aborted execution

ui_test/src/rustc_stderr.rs

@@ -117,7 +117,7 @@ impl Span {
 }
 
 pub(crate) fn filter_annotations_from_rendered(rendered: &str) -> std::borrow::Cow<'_, str> {
-    let annotations = Regex::new(r" *//(\[[^\]]\])?~.*").unwrap();
+    let annotations = Regex::new(r" *//(\[[a-z,]+\])?~.*").unwrap();
     annotations.replace_all(rendered, "")
 }