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

Updated for latest Rust.

Browse source
This commit is contained in:
Aaron Weiss 2015-03-26 21:50:38 -04:00
parent c9b9988768
commit a23fcd6ba2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/data/config.rs
View file

@ -189,7 +189,7 @@ impl Config {
/// This will also panic if used and there are no options. /// This will also panic if used and there are no options.
#[stable] #[stable]
pub fn get_option(&self, option: &str) -> &str { pub fn get_option(&self, option: &str) -> &str {
self.options.as_ref().map(|o| &o[option.to_owned()][..]).unwrap() self.options.as_ref().map(|o| &o[&option.to_owned()][..]).unwrap()
} }
} }

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

@ -192,7 +192,7 @@ impl<T: IrcRead, U: IrcWrite> IrcServer<T, U> {
if &msg.command[..] == "JOIN" { if &msg.command[..] == "JOIN" {
vec.push(User::new(&src[..i])); vec.push(User::new(&src[..i]));
} else { } else {
if let Some(n) = vec.as_slice().position_elem(&User::new(&src[..i])) { if let Some(n) = vec.position_elem(&User::new(&src[..i])) {
vec.swap_remove(n); vec.swap_remove(n);
} }
} }
@ -202,7 +202,7 @@ impl<T: IrcRead, U: IrcWrite> IrcServer<T, U> {
} else if let ("MODE", [ref chan, ref mode, ref user]) = (&msg.command[..], &msg.args[..]) { } else if let ("MODE", [ref chan, ref mode, ref user]) = (&msg.command[..], &msg.args[..]) {
if cfg!(not(feature = "nochanlists")) { if cfg!(not(feature = "nochanlists")) {
if let Some(vec) = self.chanlists.lock().unwrap().get_mut(chan) { if let Some(vec) = self.chanlists.lock().unwrap().get_mut(chan) {
if let Some(n) = vec.as_slice().position_elem(&User::new(&user)) { if let Some(n) = vec.position_elem(&User::new(&user)) {
vec[n].update_access_level(&mode); vec[n].update_access_level(&mode);
} }
} }

2
src/lib.rs
View file

@ -7,7 +7,7 @@
#![feature(collections, core, io, str_char, tcp)] #![feature(collections, core, io, str_char, tcp)]
#[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;
#[cfg(feature = "ssl")] extern crate openssl; #[cfg(feature = "ssl")] extern crate openssl;
pub mod client; pub mod client;