From da29644eb17a0a4372888a4cc98c8f753c477129 Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Tue, 13 Jan 2015 04:07:04 -0500 Subject: [PATCH] Updated code for line-wrapping. --- src/client/server/mod.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/client/server/mod.rs b/src/client/server/mod.rs index 704f54e..e1b5563 100644 --- a/src/client/server/mod.rs +++ b/src/client/server/mod.rs @@ -165,21 +165,20 @@ impl IrcServer { } if &msg.command[] == "PING" { self.send(PONG(&msg.suffix.as_ref().unwrap()[], None)).unwrap(); - } else if &msg.command[] == "JOIN" || &msg.command[] == "PART" { + } else if cfg!(not(feature = "nochanlists")) && + (&msg.command[] == "JOIN" || &msg.command[] == "PART") { let chan = match msg.suffix { Some(ref suffix) => &suffix[], None => &msg.args[0][], }; - if cfg!(not(feature = "nochanlists")) { - if let Some(vec) = self.chanlists.lock().unwrap().get_mut(&String::from_str(chan)) { - if let Some(ref src) = msg.prefix { - if let Some(i) = src.find('!') { - if &msg.command[] == "JOIN" { - vec.push(User::new(&src[..i])); - } else { - if let Some(n) = vec.as_slice().position_elem(&User::new(&src[..i])) { - vec.swap_remove(n); - } + if let Some(vec) = self.chanlists.lock().unwrap().get_mut(&String::from_str(chan)) { + if let Some(ref src) = msg.prefix { + if let Some(i) = src.find('!') { + if &msg.command[] == "JOIN" { + vec.push(User::new(&src[..i])); + } else { + if let Some(n) = vec.as_slice().position_elem(&User::new(&src[..i])) { + vec.swap_remove(n); } } }