apitest: Make OtterArgsSpec take &dyn Substitutor

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

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 9d1151de313c255272852761948b39a68de7c58b..e3d3be530dbe87c33f5dc708e1eb6b8b203d6e17 100644 (file)
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -742,16 +742,16 @@ impl Drop for OtterOutput {
 }
 
 pub trait OtterArgsSpec {
-  fn to_args(&self, ds: &DirSubst) -> Vec<String>;
+  fn to_args(&self, ds: &dyn Substitutor) -> Vec<String>;
 }
 
 impl<S> OtterArgsSpec for [S] where for <'s> &'s S: Into<String> {
-  fn to_args(&self, _: &DirSubst) -> Vec<String> {
+  fn to_args(&self, _: &dyn Substitutor) -> Vec<String> {
     self.iter().map(|s| s.into()).collect()
   }
 }
 impl<S> OtterArgsSpec for Vec<S> where for <'s> &'s S: Into<String> {
-  fn to_args(&self, ds: &DirSubst) -> Vec<String> {
+  fn to_args(&self, ds: &dyn Substitutor) -> Vec<String> {
     self.as_slice().to_args(ds)
   }
 }