From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Feb 2021 16:10:01 +0000 (+0000)
Subject: Rename pto back to p
X-Git-Tag: otter-0.4.0~272
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f8e72bf5bbd781f54b2ff15306dac0b36e77a7fe;p=otter.git

Rename pto back to p

I'm finding the new name ugly

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 40e1fdab..e39ed1bf 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -378,22 +378,22 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
       let pieces = ig.gs.pieces.iter().filter_map(
         |(piece,gpc)| (|| Ok::<_,MgmtError>(if_chain!{
           let &GPiece { pos, face, .. } = gpc;
-          if let Some(pto) = ig.ipieces.get(piece);
+          if let Some(p) = ig.ipieces.get(piece);
           let visible = if ! piece_at_all_occluded(&ig.gs.occults, piece) {
             // todo: something more sophisticated would be nice
             let pri = PieceRenderInstructions::new_visible(
               // visible id is internal one here
               VisiblePieceId(piece.data())
             );
-            let bbox = pto.bbox_approx()?;
-            let desc_html = pri.describe(gpc, pto);
+            let bbox = p.bbox_approx()?;
+            let desc_html = pri.describe(gpc, p);
             Some(MgmtGamePieceVisibleInfo {
               pos, face, desc_html, bbox
             })
           } else {
             None
           };
-          let itemname = pto.itemname().to_string();
+          let itemname = p.itemname().to_string();
           then {
             Some(MgmtGamePieceInfo {
               piece, itemname,
@@ -559,17 +559,17 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
 
     MGI::DeletePiece(piece) => {
       let (ig, modperm, _) = cs.check_acl_modify_pieces(ag, ig)?;
-      let pto = ig.ipieces.as_mut(modperm)
+      let p = ig.ipieces.as_mut(modperm)
         .remove(piece).ok_or(ME::PieceNotFound)?;
       let gs = &mut ig.gs;
       let gpc = gs.pieces.as_mut(modperm).remove(piece);
       let desc_html = if let Some(gpc) = &gpc {
         let pri = PieceRenderInstructions::new_visible(default());
-        pri.describe(gpc, &pto)
+        pri.describe(gpc, &p)
       } else {
         Html::lit("<piece partially missing from game state!>")
       };
-      if let Some(gpc) = gpc { pto.delete_hook(&gpc, gs); }
+      if let Some(gpc) = gpc { p.delete_hook(&gpc, gs); }
       (U{ pcs: vec![(piece, PieceUpdateOp::Delete())],
           log: vec![ LogEntry {
             html: Html(format!("A piece {} was removed from the game",
diff --git a/daemon/session.rs b/daemon/session.rs
index 346bc409..d3fcc68c 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -111,15 +111,15 @@ fn session_inner(form: Json<SessionForm>,
     pieces.sort_by_key(|(_,pr)| &pr.zlevel);
 
     for (piece, gpc) in pieces {
-      let pto = if let Some(pto) = ig.ipieces.get(piece) { pto }
+      let p = if let Some(pto) = ig.ipieces.get(piece) { pto }
       else { continue /* was deleted */ };
 
       let pri = piece_pri(&ig.gs.occults, player, gpl, piece, gpc);
       let pri = if let Some(pri) = pri { pri } else { continue /*invisible*/};
 
-      let defs = pri.make_defs(gpc, pto)?;
+      let defs = pri.make_defs(gpc, p)?;
       alldefs.push((pri.vpid, defs));
-      let desc = pri.describe(&gpc, pto);
+      let desc = pri.describe(&gpc, p);
 
       let vangle = pri.angle(gpc).to_compass();
 
@@ -130,7 +130,7 @@ fn session_inner(form: Json<SessionForm>,
         pinned: gpc.pinned,
         angle: vangle,
         desc,
-        uos: &pri.ui_operations(gpc, pto.as_ref())?,
+        uos: &pri.ui_operations(gpc, p.as_ref())?,
       };
 
       let for_piece = SessionPieceContext {
diff --git a/src/gamestate.rs b/src/gamestate.rs
index 1320bc67..7eceb6fc 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -131,7 +131,7 @@ pub struct UoDescription {
   pub wrc: WhatResponseToClientOp,
 }
 
-#[typetag::serde] // usual variable: pto ("piece trait object")
+#[typetag::serde] // usual variable: p
 pub trait PieceTrait: OutlineTrait + Send + Debug {
   /// by convention, occult face is nfaces-1
   // xxx this is no good, we need a central definition of the occult
diff --git a/src/updates.rs b/src/updates.rs
index 250dce33..95a2ad9b 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -204,7 +204,7 @@ pub fn log_did_to_piece_whoby(
   occults: &GameOccults,
   player: PlayerId,
   gpl: &mut GPlayer,
-  piece: PieceId, gpc: &GPiece, pto: &dyn PieceTrait,
+  piece: PieceId, gpc: &GPiece, p: &dyn PieceTrait,
   did: &str,
 ) -> (Vec<LogEntry>, Option<Html>) {
   let who_by = Html(htmlescape::encode_minimal(&gpl.nick));
@@ -215,7 +215,7 @@ pub fn log_did_to_piece_whoby(
     "{} {} {}",
     &who_by.0,
     did,
-    pri.describe(gpc, &pto).0,
+    pri.describe(gpc, &p).0,
   ))}];
   (log, Some(who_by))
 }
@@ -225,10 +225,10 @@ pub fn log_did_to_piece(
   occults: &GameOccults,
   player: PlayerId,
   gpl: &mut GPlayer,
-  piece: PieceId, gpc: &GPiece, pto: &dyn PieceTrait,
+  piece: PieceId, gpc: &GPiece, p: &dyn PieceTrait,
   did: &str,
 ) -> Vec<LogEntry> {
-  log_did_to_piece_whoby(occults,player,gpl,piece,gpc,pto,did)?.0
+  log_did_to_piece_whoby(occults,player,gpl,piece,gpc,p,did)?.0
 }
 
 // ---------- prepared updates, queued in memory ----------