From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Jul 2021 16:56:57 +0000 (+0100)
Subject: jstest: lower: introduce Vpid
X-Git-Tag: otter-0.7.2~206
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1d1d77cf819e0a3ca6647a9aafe55d033bfc0ea5;p=otter.git

jstest: lower: introduce Vpid

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

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index ef494309..41cd47c6 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -4,6 +4,8 @@
 
 use otter_nodejs_tests::*;
 
+pub type Vpid = VisiblePieceId;
+
 #[derive(StructOpt,Debug,Clone)]
 pub struct Opts {
   pub nodejs: String,
@@ -44,8 +46,8 @@ pub struct Tests {
 pub struct Test {
   name: String,
   #[serde(with = "indexmap::serde_seq")]
-  pieces: IndexMap<VisiblePieceId, StartPiece>,
-  targets: Vec<VisiblePieceId>,
+  pieces: IndexMap<Vpid, StartPiece>,
+  targets: Vec<Vpid>,
 }
 
 #[derive(Debug)]
@@ -77,7 +79,7 @@ impl Test {
       struct Nbt<'o,'n> {
         old_z: &'o ZCoord,
         new_z: &'n ZCoord,
-        id: VisiblePieceId,
+        id: Vpid,
       }
       let mut nbts = self.targets.iter()
         .filter_map(|&id| {