From 6446bb87dbd2211e8f16dfd55ebb085208d43ef1 Mon Sep 17 00:00:00 2001 From: Adrian Malacoda Date: Thu, 22 Feb 2018 03:13:03 -0600 Subject: [PATCH] there was a better way to do it --- src/modules/autolink.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/modules/autolink.rs b/src/modules/autolink.rs index 37f626d..6c4a0a4 100644 --- a/src/modules/autolink.rs +++ b/src/modules/autolink.rs @@ -20,7 +20,7 @@ use std::collections::BTreeMap; pub struct AutolinkModule {} impl AutolinkModule { - pub fn new (_: &Table, config: &Table) -> Box { + pub fn new (_: &Table, _: &Table) -> Box { Box::new(AutolinkModule {}) } } @@ -41,11 +41,8 @@ fn print_mtg_card (card: &MtgCard, message: &Message) { message.reply(&format!("*{}*", flavor)); } - // 12 March 2017: Is there a better way to do this? - if let Some(ref power) = card.power { - if let Some(ref toughness) = card.toughness { - message.reply(&format!("{}/{}", power, toughness)); - } + if let (&Some(ref power), &Some(ref toughness)) = (&card.power, &card.toughness) { + message.reply(&format!("{}/{}", power, toughness)); } } @@ -68,10 +65,8 @@ fn print_ygo_card (card: &YugiohCard, message: &Message) { message.reply(&format!("{}", card.text)); - if let Some(ref atk) = card.atk { - if let Some(ref def) = card.def { - message.reply(&format!("{}/{}", atk, def)); - } + if let (&Some(ref atk), &Some(ref def)) = (&card.atk, &card.def) { + message.reply(&format!("{}/{}", atk, def)); } }