From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Mar 2021 20:36:11 +0000 (+0000)
Subject: wdt: Break out find_conflict
X-Git-Tag: otter-0.4.0~54
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=659e56360d36a2e311bd5340a0e9a6dca6ed8517;p=otter.git

wdt: Break out find_conflict

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index f1f23708..76ee892a 100644
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -314,6 +314,13 @@ impl<'g> WindowGuard<'g> {
 
 }
 
+#[ext(pub)]
+impl Vec<String> {
+  fn find_conflict(&self) -> Option<&String> {
+    self.iter().find(|m| m.starts_with("Conflict!"))
+  }
+}
+
 pub type WebCoord = i32;
 pub type WebPos = (WebCoord, WebCoord);
 
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 6f38cd53..88b9e281 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -264,7 +264,7 @@ impl Ctx {
     assert_eq!(n.held, y.held);
 
     for got in &gots {
-      let conflict = got.log.iter().any(|m| m.starts_with("Conflict!"));
+      let conflict = got.log.find_conflict().is_some();
       assert_eq!(conflict, !got.yes);
     }
   }