From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Jan 2021 21:15:08 +0000 (+0000)
Subject: wdt: clean up conflict check
X-Git-Tag: otter-0.4.0~638
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9617dc0d007ac61c5e901a13feb60035bb2b7b64;p=otter.git

wdt: clean up conflict check

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

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 834a369f..46fde760 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -203,8 +203,6 @@ impl Ctx {
       let w = su.w(side.window)?;
       let p = w.find_piece(pc)?;
 
-      // xxx why do both report conflict
-      // xxx why has neither actually moved it
       w.action_chain()
         .move_w(&w, side.start)?
         .click()
@@ -216,17 +214,6 @@ impl Ctx {
 
         .perform()
         .context("conflicting drag")?;
-
-//      let mut pause = Duration::from_millis(1);
-//      loop {
-//        ensure!( pause < Duration::from_secs(1) );
-//        dbg!(pause);
-//        sleep(pause);
-        let _now = p.posg()?;
-//ensure_eq!(now, side.try_end);
-//        if now == side.try_end { break }
-//        pause *= 2;
-//      }
     }
 
     nix::sys::signal::kill(pid, nix::sys::signal::SIGCONT)?;
@@ -254,7 +241,6 @@ impl Ctx {
         })
         .collect::<Result<Vec<String>,_>>()?;
 
-      // xxx clone and hack
       let held = w.piece_held(&pc)?;
 
       Ok::<_,AE>(Got { now, log, held })