From a34a4accaf1c1ed7fab926daddb7e83b98e5cf4d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 27 Apr 2020 22:12:31 +0200
Subject: [PATCH] make amqp error type generic

---
 ofborg/src/easyamqp.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ofborg/src/easyamqp.rs b/ofborg/src/easyamqp.rs
index 02f13a8..23b616b 100644
--- a/ofborg/src/easyamqp.rs
+++ b/ofborg/src/easyamqp.rs
@@ -297,28 +297,32 @@ pub fn session_from_config(config: &RabbitMQConfig) -> Result<amqp::Session, amq
 }
 
 pub trait TypedWrappers {
-    fn consume<T>(&mut self, callback: T, config: ConsumeConfig) -> Result<String, amqp::AMQPError>
+    type Error;
+
+    fn consume<T>(&mut self, callback: T, config: ConsumeConfig) -> Result<String, Self::Error>
     where
         T: amqp::Consumer + 'static;
 
     fn declare_exchange(
         &mut self,
         config: ExchangeConfig,
-    ) -> Result<amqp::protocol::exchange::DeclareOk, amqp::AMQPError>;
+    ) -> Result<amqp::protocol::exchange::DeclareOk, Self::Error>;
 
     fn declare_queue(
         &mut self,
         config: QueueConfig,
-    ) -> Result<amqp::protocol::queue::DeclareOk, amqp::AMQPError>;
+    ) -> Result<amqp::protocol::queue::DeclareOk, Self::Error>;
 
     fn bind_queue(
         &mut self,
         config: BindQueueConfig,
-    ) -> Result<amqp::protocol::queue::BindOk, amqp::AMQPError>;
+    ) -> Result<amqp::protocol::queue::BindOk, Self::Error>;
 }
 
 impl TypedWrappers for amqp::Channel {
-    fn consume<T>(&mut self, callback: T, config: ConsumeConfig) -> Result<String, amqp::AMQPError>
+    type Error = amqp::AMQPError;
+
+    fn consume<T>(&mut self, callback: T, config: ConsumeConfig) -> Result<String, Self::Error>
     where
         T: amqp::Consumer + 'static,
     {
@@ -337,7 +341,7 @@ impl TypedWrappers for amqp::Channel {
     fn declare_exchange(
         &mut self,
         config: ExchangeConfig,
-    ) -> Result<amqp::protocol::exchange::DeclareOk, amqp::AMQPError> {
+    ) -> Result<amqp::protocol::exchange::DeclareOk, Self::Error> {
         self.exchange_declare(
             config.exchange,
             config.exchange_type.into(),
@@ -353,7 +357,7 @@ impl TypedWrappers for amqp::Channel {
     fn declare_queue(
         &mut self,
         config: QueueConfig,
-    ) -> Result<amqp::protocol::queue::DeclareOk, amqp::AMQPError> {
+    ) -> Result<amqp::protocol::queue::DeclareOk, Self::Error> {
         self.queue_declare(
             config.queue,
             config.passive,
@@ -368,7 +372,7 @@ impl TypedWrappers for amqp::Channel {
     fn bind_queue(
         &mut self,
         config: BindQueueConfig,
-    ) -> Result<amqp::protocol::queue::BindOk, amqp::AMQPError> {
+    ) -> Result<amqp::protocol::queue::BindOk, Self::Error> {
         self.queue_bind(
             config.queue,
             config.exchange,