From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 17:39:29 +0000 (+0000)
Subject: Make op::Core a supertrait of op::Complex, not op::Simple
X-Git-Tag: otter-0.4.0~308
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bfad038f050491faa3b036b96c87e8e136c33af9;p=otter.git

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 3d865f4e..84d8f325 100644
--- 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![])