From 5258eb7dde77f002e31e16f1fad5c420d1c9e535 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 31 Mar 2021 19:36:59 +0100 Subject: [PATCH] Revert "cmd updates: Restart updates when insert follows delete" This is not sufficient - it happens just too late. This reverts commit 0dd82eda76f4750e39ca18b586c7f7a1cf8ed9c7. --- daemon/cmdlistener.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index 1556e5e0..b7dfdd67 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -924,7 +924,6 @@ fn execute_for_game<'cs, 'igr, 'ig: 'igr>( #[derive(Debug,Default)] struct UpdateHandlerBulk { pieces: HashMap>, - have_deleted: bool, logs: bool, raw: Vec, } @@ -953,15 +952,6 @@ impl UpdateHandler { match self { Bulk(bulk) => { for (upiece, uuop) in updates.pcs { - match uuop { - Insert(()) if bulk.have_deleted => { - UpdateHandler::Bulk(mem::take(bulk)).complete(g, who)?; - }, - Delete() => { - bulk.have_deleted = true; - }, - _ => { }, - } use PieceUpdateOp::*; let oe = bulk.pieces.get(&upiece); let ne = match (oe, uuop) { -- 2.30.2