Make op::Core a supertrait of op::Complex, not op::Simple

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 3d865f4e6283db65234f2906ab82fb8abaa727b4..84d8f32584f74add80e9ae8d2ee17cb18331bafe 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -47,7 +47,7 @@ mod op {
     }
   }
 
-  pub trait Simple: Core + Debug { 
+  pub trait Simple: Debug { 
     #[throws(ApiPieceOpError)]
     fn op(&self, a: ApiPieceOpArgs) -> PieceUpdate;
   }
@@ -57,7 +57,7 @@ mod op {
     fn op_complex(&self, a: ApiPieceOpArgs) -> UpdateFromOpComplex;
   }
 
-  impl<T> Complex for T where T: Simple {
+  impl<T> Complex for T where T: Core + Simple {
     #[throws(ApiPieceOpError)]
     fn op_complex(&self, a: ApiPieceOpArgs) -> UpdateFromOpComplex {
       (self.op(a)?, vec![])