From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Jan 2021 20:43:37 +0000 (+0000)
Subject: wdt: Break out specs_dir nfc
X-Git-Tag: otter-0.3.0~128
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adc1f671b2e58985cee02338b39dee8747c03026;p=otter.git

wdt: Break out specs_dir nfc

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

diff --git a/wdriver.rs b/wdriver.rs
index e4e1b2ac..6f952363 100644
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -242,7 +242,7 @@ impl Substitutor for DirSubst {
       "build"  => self.start_dir.clone(),
       "abstmp" => self.abstmp.clone(),
       "target" => format!("{}/target", &self.start_dir),
-      "specs"  => format!("{}/specs" , &self.src      ),
+      "specs"  => self.specs_dir(),
       _ => return None,
     })
   }
@@ -614,6 +614,10 @@ _ = "error" # rocket
 }
 
 impl DirSubst {
+  pub fn specs_dir(&self) -> String {
+    format!("{}/specs" , &self.src)
+  }
+
   #[throws(AE)]
   pub fn otter<S:AsRef<str>>(&self, xargs: &[S]) {
     let ds = self;