DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Made some of the reactor API more generic.

Browse source
This commit is contained in:
Aaron Weiss 2018-01-27 15:35:44 +01:00
parent 982d1b5a0d
commit ff9eba2722
No known key found for this signature in database
GPG key ID: 047D32DF25DC22EF
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/reactor.rs
View file

@ -1,6 +1,6 @@
//! A system for creating and managing IRC server connections. //! A system for creating and managing IRC server connections.
use futures::{Future, Stream}; use futures::{Future, IntoFuture, Stream};
use futures::future; use futures::future;
use tokio_core::reactor::{Core, Handle}; use tokio_core::reactor::{Core, Handle};
@ -46,9 +46,10 @@ impl IrcReactor {
/// setup until the next call to run, where it will be used to process new messages over the /// setup until the next call to run, where it will be used to process new messages over the
/// connection indefinitely (or until failure). As registration is consumed by `run`, subsequent /// connection indefinitely (or until failure). As registration is consumed by `run`, subsequent
/// calls to run will require new registration. /// calls to run will require new registration.
pub fn register_server_with_handler<F>( pub fn register_server_with_handler<F, U>(
&mut self, server: IrcServer, handler: F &mut self, server: IrcServer, handler: F
) where F: Fn(&IrcServer, Message) -> error::Result<()> + 'static { ) where F: Fn(&IrcServer, Message) -> U + 'static,
U: IntoFuture<Item = (), Error = error::Error> + 'static {
self.handlers.push(Box::new(server.stream().for_each(move |message| { self.handlers.push(Box::new(server.stream().for_each(move |message| {
handler(&server, message) handler(&server, message)
}))); })));
@ -60,8 +61,8 @@ impl IrcReactor {
/// be sufficient for most use cases. /// be sufficient for most use cases.
pub fn register_future<F>( pub fn register_future<F>(
&mut self, future: F &mut self, future: F
) where F: Future<Item = (), Error = error::Error> + 'static { ) where F: IntoFuture<Item = (), Error = error::Error> + 'static {
self.handlers.push(Box::new(future)) self.handlers.push(Box::new(future.into_future()))
} }
/// Returns a handle to the internal event loop. This is a sort of escape hatch that allows you /// Returns a handle to the internal event loop. This is a sort of escape hatch that allows you