From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 6 Apr 2021 00:23:45 +0000 (+0100)
Subject: pcaliases: Tidy up
X-Git-Tag: otter-0.5.0~151
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e2f81b6e612ee002dda1c2466301a25858defcd6;p=otter.git

pcaliases: Tidy up

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

diff --git a/src/pcaliases.rs b/src/pcaliases.rs
index 322d9624..7287d6bf 100644
--- a/src/pcaliases.rs
+++ b/src/pcaliases.rs
@@ -4,29 +4,25 @@
 
 use crate::prelude::*;
 
-type Fwd = BTreeMap<String, Box<dyn PieceSpec>>;
-
-#[derive(Debug,Default,Serialize,Deserialize)]
-#[serde(transparent)]
-pub struct PieceAliasesSave(Fwd);
+type Map = BTreeMap<String, Box<dyn PieceSpec>>;
 
 #[derive(Debug,Default,Serialize,Deserialize)]
 #[serde(transparent)]
 pub struct PieceAliases {
-  fwd: Fwd,
+  map: Map,
 }
 
 impl PieceAliases {
   pub fn remove(&mut self, alias: &str) {
-    self.fwd.remove(alias);
+    self.map.remove(alias);
   }
 
   pub fn insert(&mut self, alias: String, target: Box<dyn PieceSpec>) {
-    self.fwd.insert(alias, target);
+    self.map.insert(alias, target);
   }
 
   pub fn keys(&self) -> impl Iterator<Item=&String> {
-    self.fwd.keys()
+    self.map.keys()
   }
 }
 
@@ -40,7 +36,7 @@ impl Alias {
   fn resolve<'a>(&self, pcaliases: &'a PieceAliases) -> &'a dyn PieceSpec {
     Box::as_ref(
       pcaliases
-        .fwd
+        .map
         .get(&self.target)
         .ok_or(SpecError::AliasNotFound)?
     )