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

Made iterator types well-formed to respond to RFC 1214 changes.

Browse source
This commit is contained in:
Aaron Weiss 2015-10-09 13:21:11 -04:00
parent b866785c89
commit c372403ed5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/server/mod.rs
View file

@ -257,15 +257,15 @@ impl<T: IrcRead, U: IrcWrite> IrcServer<T, U> {
}
/// An Iterator over an IrcServer's incoming Messages.
pub struct ServerIterator<'a, T: IrcRead, U: IrcWrite> {
pub struct ServerIterator<'a, T: IrcRead + 'a, U: IrcWrite + 'a> {
server: &'a IrcServer<T, U>
}
/// An Iterator over an IrcServer's incoming Commands.
pub type ServerCmdIterator<'a, T, U> =
pub type ServerCmdIterator<'a, T: IrcRead + 'a, U: IrcWrite + 'a> =
Map<ServerIterator<'a, T, U>, fn(Result<Message>) -> Result<Command>>;
impl<'a, T: IrcRead, U: IrcWrite> ServerIterator<'a, T, U> {
impl<'a, T: IrcRead + 'a, U: IrcWrite + 'a> ServerIterator<'a, T, U> {
/// Creates a new ServerIterator for the desired IrcServer.
pub fn new(server: &IrcServer<T, U>) -> ServerIterator<T, U> {
ServerIterator { server: server }
@ -284,7 +284,7 @@ impl<'a, T: IrcRead, U: IrcWrite> ServerIterator<'a, T, U> {
}
}
impl<'a, T: IrcRead, U: IrcWrite> Iterator for ServerIterator<'a, T, U> {
impl<'a, T: IrcRead + 'a, U: IrcWrite + 'a> Iterator for ServerIterator<'a, T, U> {
type Item = Result<Message>;
fn next(&mut self) -> Option<Result<Message>> {
let res = self.get_next_line().and_then(|msg|