Remove loaded_via_alias

This effectively reverts 707b43736d838436777f53b230e64054ecb244c5.

I have checked that this field is not used anywhere, including in any
relevant serialised output eg via the command listener.  As for game
save compatibility, we can simply ignore it on read (and, even go
backwards since it's Option).

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 600f10431755070cf5021c4fe2e53c2786b025ad..ebf38ee03bfbd2fa453ecc8e36fce013b89fce5a 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -1110,7 +1110,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
           last_released: default(),
           rotateable: true,
         };
-        let PieceSpecLoaded { p, loaded_via_alias, occultable } =
+        let PieceSpecLoaded { p, occultable } =
           info.load(piece_i as usize, &mut gpc, ig, SpecDepth::zero())?;
         if p.nfaces() <= face.into() {
           throw!(SpecError::FaceNotFound);
@@ -1126,7 +1126,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
             ilks.create(ilkname, OccultIlkData { p_occ })
           });
           ig.ipieces.as_mut(modperm).insert(piece, IPiece {
-            p, occilk, loaded_via_alias,
+            p, occilk,
           });
           updates.push((piece, PieceUpdateOp::Insert(())));
         })(); // <- no ?, infallible (to avoid leaking ilk)

diff --git a/src/clock.rs b/src/clock.rs
index af8fc00afcecb4fded7fc5e686e415d4b29a0a5b..69bcf432900897d8b99690fd27bcbdd407d9f0ae 100644 (file)
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -416,7 +416,6 @@ impl PieceSpec for Spec {
 
     PieceSpecLoaded {
       p: Box::new(clock),
-      loaded_via_alias: None,
       occultable: None,
     }
   }

diff --git a/src/deck.rs b/src/deck.rs
index 216dbcd23338280187a5a7d5c8b086991f95c6ef..55fe7ca3750f95f0240d588a13f4b20dad8ab9d2 100644 (file)
--- a/src/deck.rs
+++ b/src/deck.rs
@@ -65,7 +65,6 @@ impl PieceSpec for piece_specs::Deck {
     }) as Box<dyn PieceTrait>;
     PieceSpecLoaded {
       p,
-      loaded_via_alias: None,
       occultable: None,
     }
   }

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 7571c1b6275dbe4d5f44e0013e2139486a000a78..8e8a78b5cef33dcaa3b4fa3919843adf7abc4b50 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -258,7 +258,6 @@ pub struct ApiPieceOpArgs<'a> {
 #[derive(Debug)]
 pub struct PieceSpecLoaded {
   pub p: Box<dyn PieceTrait>,
-  pub loaded_via_alias: Option<String>,
   pub occultable: PieceSpecLoadedOccultable,
 }
 pub type PieceSpecLoadedOccultable =

diff --git a/src/global.rs b/src/global.rs
index 6b4471c6ce9b50a07588f7d02b7700d98e7b579a..5b70f336d5eb9c4e1759d570dd8fd08ab33872f5 100644 (file)
--- a/src/global.rs
+++ b/src/global.rs
@@ -79,7 +79,6 @@ pub struct IPlayer { // usual variable: ipl
 #[derive(Debug,Serialize,Deserialize)]
 pub struct IPiece {
   pub p: IPieceTraitObj,
-  #[serde(default)] pub loaded_via_alias: Option<String>,
   pub occilk: Option<OccultIlkOwningId>,
 }
 deref_to_field!{IPiece, IPieceTraitObj, p}

diff --git a/src/hand.rs b/src/hand.rs
index ba48ab3cb4e9178bdf8158e901141cf5aabc97ed..a07254139c37457d0a1090c051544f939ee0d632 100644 (file)
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -110,7 +110,6 @@ impl piece_specs::OwnedCommon {
     }) as Box<dyn PieceTrait>;
     PieceSpecLoaded {
       p,
-      loaded_via_alias: None,
       occultable: None,
     }
   }

diff --git a/src/pcaliases.rs b/src/pcaliases.rs
index 9ef363a427a9ec3a3049b2d4e2a052b6710a1f93..3bf7c6324c2954a81cfc5dc8337c06a81576c141 100644 (file)
--- a/src/pcaliases.rs
+++ b/src/pcaliases.rs
@@ -66,9 +66,8 @@ impl PieceSpec for Alias {
   #[throws(SpecError)]
   fn load(&self, i: usize, gpc: &mut GPiece, ig: &Instance, depth: SpecDepth)
           -> PieceSpecLoaded {
-    let mut r = self.resolve(&ig.pcaliases)?
+    let r = self.resolve(&ig.pcaliases)?
       .load(i, gpc, ig, self.new_depth(depth)?)?;
-    r.loaded_via_alias = Some(self.target.clone());
     r
   }
   #[throws(SpecError)]

diff --git a/src/pieces.rs b/src/pieces.rs
index 1c7ed1be1e1d6a54453bab4c0977bf640bb86cf8..c213e1a36122d54e985b8a765670b836e7c226da 100644 (file)
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -302,7 +302,6 @@ pub trait SimplePieceSpec: Debug {
   fn load(&self) -> PieceSpecLoaded {
     PieceSpecLoaded {
       p: Box::new(self.load_raw()?.0),
-      loaded_via_alias: None,
       occultable: None,
     }
   }

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 4e8ef4382db35a8753bdef9acc7dc2f25fd87fde..1e896da1930f55db6b672fb63dab2ac4dafcbe35 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -477,7 +477,6 @@ impl From<ItemSpecLoaded> for PieceSpecLoaded {
     PieceSpecLoaded {
       p,
       occultable,
-      loaded_via_alias: None,
     }
   }
 }