Merge pull request #90 from oli-obk/unknown_revision

Check for unknown revisions.

Author: oli-obk

src/lib.rs

@@ -696,6 +696,7 @@ fn run_rustfix(
         revisioned: std::iter::once((
             vec![],
             Revisioned {
+                line: 0,
                 ignore: vec![],
                 only: vec![],
                 stderr_per_bitwidth: false,

src/parser.rs

@@ -18,7 +18,7 @@ mod tests;
 /// get processed by their respective use sites.
 #[derive(Default, Debug)]
 pub(crate) struct Comments {
-    /// List of revision names to execute. Can only be speicified once
+    /// List of revision names to execute. Can only be specified once
     pub revisions: Option<Vec<String>>,
     /// Comments that are only available under specific revisions.
     /// The defaults are in key `vec![]`
@@ -78,6 +78,9 @@ impl Comments {
 #[derive(Default, Debug)]
 /// Comments that can be filtered for specific revisions.
 pub(crate) struct Revisioned {
+    /// The line in which this revisioned item was first added.
+    /// Used for reporting errors on unknown revisions.
+    pub line: usize,
     /// Don't run this test if any of these filters apply
     pub ignore: Vec<Condition>,
     /// Only run this test if all of these filters apply
@@ -210,6 +213,27 @@ impl Comments {
                 }),
             }
         }
+        if let Some(revisions) = &parser.comments.revisions {
+            for (key, revisioned) in &parser.comments.revisioned {
+                for rev in key {
+                    if !revisions.contains(rev) {
+                        parser.errors.push(Error::InvalidComment {
+                            msg: format!("the revision `{rev}` is not known"),
+                            line: revisioned.line,
+                        })
+                    }
+                }
+            }
+        } else {
+            for (key, revisioned) in &parser.comments.revisioned {
+                if !key.is_empty() {
+                    parser.errors.push(Error::InvalidComment {
+                        msg: "there are no revisions in this test".into(),
+                        line: revisioned.line,
+                    })
+                }
+            }
+        }
         if parser.errors.is_empty() {
             Ok(parser.comments)
         } else {
@@ -332,10 +356,17 @@ impl CommentParser<Comments> {
         revisions: Vec<String>,
         f: impl FnOnce(&mut CommentParser<&mut Revisioned>),
     ) {
+        let line = self.line;
         let mut this = CommentParser {
             errors: std::mem::take(&mut self.errors),
-            line: self.line,
-            comments: self.revisioned.entry(revisions).or_default(),
+            line,
+            comments: self
+                .revisioned
+                .entry(revisions)
+                .or_insert_with(|| Revisioned {
+                    line,
+                    ..Default::default()
+                }),
         };
         f(&mut this);
         self.errors = this.errors;

tests/integrations/basic-fail/Cargo.stderr

@@ -207,6 +207,8 @@ tests/actual_tests_bless/revisions_multiple_per_annotation.rs (foo) ... ok
 tests/actual_tests_bless/revisions_multiple_per_annotation.rs (bar) ... ok
 tests/actual_tests_bless/revisions_same_everywhere.rs (foo) ... ok
 tests/actual_tests_bless/revisions_same_everywhere.rs (bar) ... ok
+tests/actual_tests_bless/unknown_revision.rs ... FAILED
+tests/actual_tests_bless/unknown_revision2.rs ... FAILED
 
 tests/actual_tests_bless/aux_proc_macro_misuse.rs FAILED:
 command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/$DIR/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/$DIR/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/$DIR/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/$DIR/../../../target/$TMP/$TRIPLE/debug" "--out-dir" "$TMP "tests/actual_tests_bless/auxiliary/the_proc_macro.rs" "--edition" "2021" "--crate-type" "lib" "--emit=link"
@@ -464,6 +466,26 @@ error: aborting due to previous error
 For more information about this error, try `rustc --explain E0601`.
 
 
+
+tests/actual_tests_bless/unknown_revision.rs FAILED:
+command: "parse comments"
+
+Could not parse comment in tests/actual_tests_bless/unknown_revision.rs:3 because
+there are no revisions in this test
+
+full stderr:
+
+
+
+tests/actual_tests_bless/unknown_revision2.rs FAILED:
+command: "parse comments"
+
+Could not parse comment in tests/actual_tests_bless/unknown_revision2.rs:5 because
+the revision `cake` is not known
+
+full stderr:
+
+
 FAILURES:
     tests/actual_tests_bless/aux_proc_macro_misuse.rs
     tests/actual_tests_bless/aux_proc_macro_no_main.rs
@@ -481,8 +503,10 @@ FAILURES:
     tests/actual_tests_bless/revisioned_executable_panic.rs (revision run)
     tests/actual_tests_bless/revisioned_executable_panic.rs (revision panic)
     tests/actual_tests_bless/revisions_bad.rs (revision bar)
+    tests/actual_tests_bless/unknown_revision.rs
+    tests/actual_tests_bless/unknown_revision2.rs
 
-test result: FAIL. 16 tests failed, 12 tests passed, 3 ignored, 0 filtered out
+test result: FAIL. 18 tests failed, 12 tests passed, 3 ignored, 0 filtered out
    Building test dependencies...
 tests/actual_tests_bless_yolo/foomp-rustfix-fail.rs ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (foo) ... ok

tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs

@@ -0,0 +1,4 @@
+fn main() {
+    assert_eq!(5, 6);
+    //~[cake, lie] ERROR: kawoom
+}

tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs

@@ -0,0 +1,6 @@
+//@ revisions: cheese lie
+
+fn main() {
+    assert_eq!(5, 6);
+    //~[cake, lie] ERROR: kawoom
+}