From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Feb 2021 16:19:50 +0000 (+0000)
Subject: Fix some more variable names
X-Git-Tag: otter-0.4.0~270
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c856e2056c4d1afeaf40bed4706eca9961464890;p=otter.git

Fix some more variable names

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

diff --git a/src/updates.rs b/src/updates.rs
index 95a2ad9b..8e7c38e7 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -530,11 +530,11 @@ impl<'r> PrepareUpdatesBuffer<'r> {
     let gen = self.gen();
     let gs = &mut self.g.gs;
 
-    let mut pc = gs.pieces.byid_mut(piece).ok();
+    let mut gpc = gs.pieces.byid_mut(piece).ok();
     let p = self.g.ipieces.get(piece);
 
-    if let Some(ref mut pc) = pc {
-      gen_update(pc, gen, &self.by_client);
+    if let Some(ref mut gpc) = gpc {
+      gen_update(gpc, gen, &self.by_client);
     }
     let mut out: SecondarySlotMap<PlayerId, PreparedPieceUpdate> = default();
     for (player, gpl) in &mut gs.players {
@@ -545,11 +545,11 @@ impl<'r> PrepareUpdatesBuffer<'r> {
           None => continue,
         }
       };
-      let op = match (&mut pc, p) {
-        (Some(pc), Some(p)) => {
-          let pri = piece_pri(&gs.occults, player, gpl, piece, *pc);
+      let op = match (&mut gpc, p) {
+        (Some(gpc), Some(p)) => {
+          let pri = piece_pri(&gs.occults, player, gpl, piece, *gpc);
           Self::piece_update_player(
-            &mut gs.max_z, pc, p, ops, &pri
+            &mut gs.max_z, gpc, p, ops, &pri
           )?
         }
         _ => Some(PreparedPieceUpdate {