From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 28 Dec 2020 22:54:46 +0000 (+0000)
Subject: wip otter cmd debug
X-Git-Tag: otter-0.2.0~105
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d24623de4fb23b7ea003841c3b93f7e4d256300a;p=otter.git

wip otter cmd debug

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

diff --git a/wdriver.rs b/wdriver.rs
index ed9658db..aa2fd1f9 100644
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -558,14 +558,15 @@ _ = "error" # rocket
 
 impl DirSubst {
   #[throws(AE)]
-  pub fn otter<S:AsRef<std::ffi::OsStr>>(&self, args: &[S]) {
+  pub fn otter<S:AsRef<str>>(&self, xargs: &[S]) {
     let ds = self;
     let exe = ds.subst("@target@/debug/otter")?;
+    let mut args : Vec<&str> = vec![];
+    args.extend(&["--config", CONFIG]);
+    args.extend(xargs.iter().map(AsRef::as_ref));
     (||{
       let mut cmd = Command::new(&exe);
-      cmd
-        .args(&["--config", CONFIG])
-        .args(&*args);
+      cmd.args(&args);
       let st = cmd
         .spawn().context("spawn")?
         .wait().context("wait")?;