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

Updated for Rust master.

Browse source
This commit is contained in:
Aaron Weiss 2015-01-08 12:51:40 -05:00
parent 72e5cb00b2
commit e3365d235e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -4,7 +4,7 @@
#![unstable] #![unstable]
#![warn(missing_docs)] #![warn(missing_docs)]
#![feature(associated_types, slicing_syntax)] #![feature(slicing_syntax)]
#[cfg(feature = "ctcp")] extern crate time; #[cfg(feature = "ctcp")] extern crate time;
#[cfg(feature = "encode")] extern crate encoding; #[cfg(feature = "encode")] extern crate encoding;
extern crate "rustc-serialize" as rustc_serialize; extern crate "rustc-serialize" as rustc_serialize;

8
src/server/mod.rs
View file

@ -3,7 +3,7 @@
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::collections::HashMap; use std::collections::HashMap;
use std::io::{BufferedReader, BufferedWriter, IoError, IoErrorKind, IoResult}; use std::io::{BufferedReader, BufferedWriter, IoError, IoErrorKind, IoResult};
use std::sync::{Mutex, RWLock}; use std::sync::{Mutex, RwLock};
use conn::{Connection, NetStream}; use conn::{Connection, NetStream};
use data::{Command, Config, Message, Response, User}; use data::{Command, Config, Message, Response, User};
use data::Command::{JOIN, NICK, NICKSERV, PONG}; use data::Command::{JOIN, NICK, NICKSERV, PONG};
@ -35,7 +35,7 @@ pub struct IrcServer<T: IrcReader, U: IrcWriter> {
/// A thread-safe map of channels to the list of users in them. /// A thread-safe map of channels to the list of users in them.
chanlists: Mutex<HashMap<String, Vec<User>>>, chanlists: Mutex<HashMap<String, Vec<User>>>,
/// A thread-safe index to track the current alternative nickname being used. /// A thread-safe index to track the current alternative nickname being used.
alt_nick_index: RWLock<uint>, alt_nick_index: RwLock<uint>,
} }
/// An IrcServer over a buffered NetStream. /// An IrcServer over a buffered NetStream.
@ -59,7 +59,7 @@ impl IrcServer<BufferedReader<NetStream>, BufferedWriter<NetStream>> {
Connection::connect(config.server(), config.port()) Connection::connect(config.server(), config.port())
}); });
Ok(IrcServer { config: config, conn: conn, chanlists: Mutex::new(HashMap::new()), Ok(IrcServer { config: config, conn: conn, chanlists: Mutex::new(HashMap::new()),
alt_nick_index: RWLock::new(0u) }) alt_nick_index: RwLock::new(0u) })
} }
/// Reconnects to the IRC server. /// Reconnects to the IRC server.
@ -98,7 +98,7 @@ impl<T: IrcReader, U: IrcWriter> IrcServer<T, U> {
#[experimental] #[experimental]
pub fn from_connection(config: Config, conn: Connection<T, U>) -> IrcServer<T, U> { pub fn from_connection(config: Config, conn: Connection<T, U>) -> IrcServer<T, U> {
IrcServer { conn: conn, config: config, chanlists: Mutex::new(HashMap::new()), IrcServer { conn: conn, config: config, chanlists: Mutex::new(HashMap::new()),
alt_nick_index: RWLock::new(0u) } alt_nick_index: RwLock::new(0u) }
} }
/// Gets a reference to the IRC server's connection. /// Gets a reference to the IRC server's connection.