drop deprecated error handling methods

Now replaced by Event::Error

Author: Keruspe

src/channel.rs

@@ -9,7 +9,6 @@ use crate::{
     connection_status::{ConnectionResolver, ConnectionStep},
     consumer::Consumer,
     consumers::Consumers,
-    error_handler::ErrorHandler,
     events::EventsSender,
     frames::{ExpectedReply, Frames},
     internal_rpc::InternalRPCHandle,
@@ -54,7 +53,6 @@ pub struct Channel {
     waker: SocketStateHandle,
     internal_rpc: InternalRPCHandle,
     frames: Frames,
-    error_handler: ErrorHandler,
     events_sender: EventsSender,
     channel_closer: Option<Arc<ChannelCloser>>,
     _connection_closer: Option<Arc<ConnectionCloser>>,
@@ -120,7 +118,6 @@ impl Channel {
             waker,
             internal_rpc,
             frames,
-            error_handler: ErrorHandler::default(),
             events_sender,
             channel_closer,
             _connection_closer: connection_closer,
@@ -132,14 +129,8 @@ impl Channel {
         &self.status
     }
 
-    #[deprecated(note = "Please use Connection::events_listener instead")]
-    pub fn on_error<E: FnMut(Error) + Send + 'static>(&self, handler: E) {
-        self.error_handler.set_handler(handler);
-    }
-
     pub async fn wait_for_recovery(&self, error: Error) -> Result<()> {
         if self.recovery_config.can_recover(&error) {
-            #[allow(deprecated)]
             if let Some(notifier) = error.notifier() {
                 notifier.await;
                 return Ok(());
@@ -645,7 +636,6 @@ impl Channel {
             self.set_closed(err);
             if let Some(error) = error {
                 self.events_sender.error(error.clone());
-                self.error_handler.on_error(error);
             }
         }
     }

src/channels.rs

@@ -2,7 +2,6 @@ use crate::{
     BasicProperties, Channel, ChannelState, Configuration, Connection, ConnectionProperties,
     ConnectionState, ConnectionStatus, Error, ErrorKind, Promise, Result,
     connection_closer::ConnectionCloser,
-    error_handler::ErrorHandler,
     events::{Events, EventsSender},
     frames::Frames,
     id_sequence::IdSequence,
@@ -32,7 +31,6 @@ pub(crate) struct Channels {
     internal_rpc: InternalRPCHandle,
     frames: Frames,
     connection_killswitch: KillSwitch,
-    error_handler: ErrorHandler,
     events: Events,
     uri: AMQPUri,
     options: ConnectionProperties,
@@ -71,7 +69,6 @@ impl Channels {
             internal_rpc,
             frames,
             connection_killswitch: KillSwitch::default(),
-            error_handler: ErrorHandler::default(),
             events,
             uri,
             options,
@@ -188,7 +185,6 @@ impl Channels {
 
         self.frames.drop_pending(error.clone());
         self.events.sender().error(error.clone());
-        self.error_handler.on_error(error.clone());
         for (id, channel) in self.lock_inner().channels.iter() {
             self.frames.clear_expected_replies(*id, error.clone());
             channel.set_connection_error(error.clone());
@@ -301,10 +297,6 @@ impl Channels {
         Ok(())
     }
 
-    pub(crate) fn set_error_handler<E: FnMut(Error) + Send + 'static>(&self, handler: E) {
-        self.error_handler.set_handler(handler);
-    }
-
     pub(crate) fn start_heartbeat(&self) {
         let heartbeat = self.configuration.heartbeat();
         if heartbeat != 0 {
@@ -388,7 +380,6 @@ impl fmt::Debug for Channels {
         debug
             .field("frames", &self.frames)
             .field("connection_status", &self.connection_status)
-            .field("error_handler", &self.error_handler)
             .finish()
     }
 }

src/connection.rs

@@ -1,5 +1,5 @@
 use crate::{
-    AsyncTcpStream, ConnectionProperties, ConnectionStatus, Error, ErrorKind, Event, Promise,
+    AsyncTcpStream, ConnectionProperties, ConnectionStatus, ErrorKind, Event, Promise,
     Result,
     channel::Channel,
     channels::Channels,
@@ -164,11 +164,6 @@ impl Connection {
         io_loop.wait("io loop")
     }
 
-    #[deprecated(note = "Please use Connection::events_listener instead")]
-    pub fn on_error<E: FnMut(Error) + Send + 'static>(&self, handler: E) {
-        self.channels.set_error_handler(handler);
-    }
-
     pub fn configuration(&self) -> &Configuration {
         &self.configuration
     }

src/error_handler.rs

@@ -147,7 +147,6 @@ mod consumer_canceler;
 mod consumer_status;
 mod consumers;
 mod error;
-mod error_handler;
 mod error_holder;
 mod events;
 mod exchange;