From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 May 2022 10:35:33 +0000 (+0100)
Subject: Change many .drain(..) into into_iter()
X-Git-Tag: otter-1.1.0~374
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=159abad60f9847d4f9de89ba2a8b4ac91b675a2b;p=otter.git

Change many .drain(..) into into_iter()

In Rust 2021 this is more convenient to write.  We retain one.

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

diff --git a/src/global.rs b/src/global.rs
index 53f95a30..11da90ed 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -789,6 +789,7 @@ impl<'ig> InstanceGuard<'ig> {
 
     self.save_game_now().map_err(|e|{
       // oof
+      #[allow(clippy::iter_with_drain)] // don't eat undo, so we can drop it
       for u in undo.drain(..).rev() {
         u(self);
       }
@@ -1237,7 +1238,7 @@ impl InstanceGuard<'_> {
     }
 
     let name = Arc::new(name);
-    let (mut tokens_players, acctids_players) = {
+    let (tokens_players, acctids_players) = {
       let mut tokens = Vec::with_capacity(tokens_players.len());
       let mut acctids = Vec::with_capacity(tokens_players.len());
       for (token, player) in tokens_players { if_chain! {
@@ -1291,7 +1292,7 @@ impl InstanceGuard<'_> {
     }
     let mut global = GLOBAL.players.write();
     for ((token, player), acctid) in
-      tokens_players.drain(0..)
+      tokens_players.into_iter()
       .zip(acctids_players)
     { if_chain!{
       if let Some(acctid) = acctid;
@@ -1586,7 +1587,7 @@ fn client_expire_old_clients() {
       expire.push(gref.clone());
     }
   }
-  for gref in expire.drain(..) {
+  for gref in expire.into_iter() {
     #[derive(Debug)]
     struct Now(HashSet<ClientId>);
     impl ClientIterator for Now {
@@ -1628,7 +1629,7 @@ fn global_expire_old_logs() {
   }
   drop(read);
 
-  for gref in want_expire.drain(..) {
+  for gref in want_expire.into_iter() {
     let mut g = gref.lock_even_destroying();
     info!("expiring old log entries in {:?}", &g.g.name);
     g.g.gs.do_expire_old_logs(cutoff);