wdt: Type alias for GameSpec

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

diff --git a/wdriver.rs b/wdriver.rs
index 5cbed8617f19e700cecf96c2d4d84a69bf0e521d..a18862d468b794bca015fc9d191a09ffc26eaf64 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -48,7 +48,7 @@ pub use otter::commands::{MgmtGameUpdateMode};
 pub use otter::gamestate::{self, Generation};
 pub use otter::global::InstanceName;
 pub use otter::mgmtchannel::MgmtChannel;
-pub use otter::spec::{Coord, Pos, PosC};
+pub use otter::spec::{Coord, GameSpec, Pos, PosC};
 pub use otter::toml_de;
 pub use otter::ui::{AbbrevPresentationLayout, PresentationLayout};
 
@@ -653,7 +653,7 @@ impl DirSubst {
   }
 
   #[throws(AE)]
-  pub fn game_spec_data(&self) -> otter::spec::GameSpec {
+  pub fn game_spec_data(&self) -> GameSpec {
     let path = self.game_spec_path()?;
     (||{
       let data = fs::read(&path).context("read")?;
@@ -1377,7 +1377,7 @@ pub struct UsualSetup {
   pub inst: Instance,
   pub alice: Window,
   pub bob: Window,
-  pub spec: otter::spec::GameSpec,
+  pub spec: GameSpec,
 }
 
 impl UsualSetup {

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 707ea4a8c3fb91f9e2db3cdfa24a2f14f50691c1..818aca1f92539d76b4dd95adb5d8259b35fc5b9f 100644 (file)
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -8,7 +8,7 @@ struct Ctx {
   su: Setup,
   alice: Window,
   bob: Window,
-  spec: otter::spec::GameSpec,
+  spec: GameSpec,
 }
 ctx_with_setup!{Ctx}