Avoid blessing duplicated Expects

Author: ecstatic-morse

tests/test/mod.rs

@@ -251,7 +251,9 @@ fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, co
             db.program_ir().unwrap()
         };
 
-        for (goal_text, solver_choice, expected) in goals {
+        let mut last_expected_pos = None;
+
+        for (goal_text, solver_choice, mut expected) in goals {
             match (&solver_choice, &expected) {
                 (SolverChoice::Recursive { .. }, TestGoal::All(_))
                 | (SolverChoice::Recursive { .. }, TestGoal::First(_)) => {
@@ -264,6 +266,15 @@ fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, co
                 db.set_solver_choice(solver_choice);
             }
 
+            if let TestGoal::Aggregated(expected) = &mut expected {
+                if let Some(last_expected_pos) = last_expected_pos {
+                    if last_expected_pos == ExpectPos::of(expected) {
+                        expected.bless(false)
+                    }
+                }
+                last_expected_pos = Some(ExpectPos::of(expected));
+            }
+
             chalk_integration::tls::set_current_program(&program, || {
                 println!("----------------------------------------------------------------------");
                 println!("goal {}", goal_text);
@@ -332,6 +343,23 @@ fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, co
     })
 }
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+struct ExpectPos {
+    file: &'static str,
+    line: u32,
+    column: u32,
+}
+
+impl ExpectPos {
+    fn of(e: &Expect) -> Self {
+        Self {
+            file: e.position.file,
+            line: e.position.line,
+            column: e.position.column
+        }
+    }
+}
+
 mod arrays;
 mod auto_traits;
 mod closures;