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

Removed unnecessary explicit lifetimes from IrcServer.

Browse source
This commit is contained in:
Aaron Weiss 2014-11-13 21:18:23 -05:00
parent dd6b6eebd3
commit 7c6843052f
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/server/mod.rs
View file

@ -27,7 +27,7 @@ pub trait Server<'a, T> {
/// A thread-safe implementation of an IRC Server connection. /// A thread-safe implementation of an IRC Server connection.
#[experimental] #[experimental]
pub struct IrcServer<'a, T> where T: IrcStream { pub struct IrcServer<T> where T: IrcStream {
/// The thread-safe IRC connection. /// The thread-safe IRC connection.
conn: Connection<T>, conn: Connection<T>,
/// The configuration used with this connection. /// The configuration used with this connection.
@ -36,10 +36,10 @@ pub struct IrcServer<'a, T> where T: IrcStream {
chanlists: Mutex<HashMap<String, Vec<User>>>, chanlists: Mutex<HashMap<String, Vec<User>>>,
} }
impl<'a> IrcServer<'a, BufferedStream<NetStream>> { impl IrcServer<BufferedStream<NetStream>> {
/// Creates a new IRC Server connection from the configuration at the specified path, connecting immediately. /// Creates a new IRC Server connection from the configuration at the specified path, connecting immediately.
#[experimental] #[experimental]
pub fn new(config: &str) -> IoResult<IrcServer<'a, BufferedStream<NetStream>>> { pub fn new(config: &str) -> IoResult<IrcServer<BufferedStream<NetStream>>> {
let config = try!(Config::load_utf8(config)); let config = try!(Config::load_utf8(config));
let conn = try!(if config.use_ssl { let conn = try!(if config.use_ssl {
Connection::connect_ssl(config.server[], config.port) Connection::connect_ssl(config.server[], config.port)
@ -51,7 +51,7 @@ impl<'a> IrcServer<'a, BufferedStream<NetStream>> {
/// Creates a new IRC server connection from the specified configuration, connecting immediately. /// Creates a new IRC server connection from the specified configuration, connecting immediately.
#[experimental] #[experimental]
pub fn from_config(config: Config) -> IoResult<IrcServer<'a, BufferedStream<NetStream>>> { pub fn from_config(config: Config) -> IoResult<IrcServer<BufferedStream<NetStream>>> {
let conn = try!(if config.use_ssl { let conn = try!(if config.use_ssl {
Connection::connect_ssl(config.server[], config.port) Connection::connect_ssl(config.server[], config.port)
} else { } else {
@ -61,7 +61,7 @@ impl<'a> IrcServer<'a, BufferedStream<NetStream>> {
} }
} }
impl<'a, T> Server<'a, T> for IrcServer<'a, T> where T: IrcStream { impl<'a, T> Server<'a, T> for IrcServer<T> where T: IrcStream {
fn config(&self) -> &Config { fn config(&self) -> &Config {
&self.config &self.config
} }
@ -79,10 +79,10 @@ impl<'a, T> Server<'a, T> for IrcServer<'a, T> where T: IrcStream {
} }
} }
impl<'a, T> IrcServer<'a, T> where T: IrcStream { impl<T> IrcServer<T> where T: IrcStream {
/// Creates an IRC server from the specified configuration, and any arbitrary Connection. /// Creates an IRC server from the specified configuration, and any arbitrary Connection.
#[experimental] #[experimental]
pub fn from_connection(config: Config, conn: Connection<T>) -> IrcServer<'a, T> { pub fn from_connection(config: Config, conn: Connection<T>) -> IrcServer<T> {
IrcServer { conn: conn, config: config, chanlists: Mutex::new(HashMap::new()) } IrcServer { conn: conn, config: config, chanlists: Mutex::new(HashMap::new()) }
} }
@ -145,13 +145,13 @@ impl<'a, T> IrcServer<'a, T> where T: IrcStream {
/// An Iterator over an IrcServer's incoming Messages. /// An Iterator over an IrcServer's incoming Messages.
#[experimental] #[experimental]
pub struct ServerIterator<'a, T> where T: IrcStream { pub struct ServerIterator<'a, T> where T: IrcStream {
pub server: &'a IrcServer<'a, T> pub server: &'a IrcServer<T>
} }
impl<'a, T> ServerIterator<'a, T> where T: IrcStream { impl<'a, T> ServerIterator<'a, T> where T: IrcStream {
/// Creates a new ServerIterator for the desired IrcServer. /// Creates a new ServerIterator for the desired IrcServer.
#[experimental] #[experimental]
pub fn new(server: &'a IrcServer<'a, T>) -> ServerIterator<'a, T> { pub fn new(server: &'a IrcServer<T>) -> ServerIterator<'a, T> {
ServerIterator { ServerIterator {
server: server server: server
} }