From 02f00d5d8890fe32c99c0a4b32e96c9161c345cb Mon Sep 17 00:00:00 2001 From: Jokler Date: Wed, 4 Oct 2017 16:04:03 +0200 Subject: Adjust formatting with cargo fmt --- src/lib.rs | 3 +-- src/plugins/emoji.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ed7e2b0..5f9bcaa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,8 +16,7 @@ pub fn run() { let server = IrcServer::new("config.toml").unwrap(); server.identify().unwrap(); - let plugins: Vec>> = - vec![Arc::new(Mutex::new(plugins::emoji::Emoji::new()))]; + let plugins: Vec>> = vec![Arc::new(Mutex::new(plugins::emoji::Emoji::new()))]; server .for_each_incoming(|message| { diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs index 8b56a14..75fc863 100644 --- a/src/plugins/emoji.rs +++ b/src/plugins/emoji.rs @@ -13,9 +13,9 @@ impl Emoji { for emoji in self.return_emojis(&content) { names.push(match unicode_names::name(emoji) { - Some(v) => format!("{}", v).to_lowercase(), - None => format!("UNKNOWN"), - }); + Some(v) => format!("{}", v).to_lowercase(), + None => format!("UNKNOWN"), + }); } server.send_privmsg(target, &names.join(", ")) @@ -59,7 +59,7 @@ impl Plugin for Emoji { fn execute(&mut self, server: &IrcServer, message: &Message) -> Result<(), IrcError> { match message.command { Command::PRIVMSG(ref target, ref content) => self.emoji(server, content, target), - _ => Ok(()) + _ => Ok(()), } } } @@ -75,14 +75,14 @@ mod tests { // // #[test] // fn emoji_message() { -// let server = make_server("PRIVMSG test :😃\r\n"); +// let server = make_server("PRIVMSG test :emoji\r\n"); // let mut plugin = Emoji::new(); // // server.for_each_incoming(|message| { // assert!(plugin.execute(&server, &message).is_ok()); // }).unwrap(); // -// assert_eq!("PRIVMSG test :smiling fce with open mouth\r\n", &*get_server_value(&server)); +// assert_eq!("PRIVMSG test :emoji name\r\n", &*get_server_value(&server)); // } // // #[test] -- cgit v1.2.3-70-g09d2