From 831a957f3cec12f389741823fbc90c40a1f827fc Mon Sep 17 00:00:00 2001 From: troido Date: Tue, 21 Apr 2020 09:08:19 +0200 Subject: left out Option::flatten() for rust 1.38 compatibility --- src/systems/attacking.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/systems/attacking.rs') diff --git a/src/systems/attacking.rs b/src/systems/attacking.rs index a202878..d9dc7ea 100644 --- a/src/systems/attacking.rs +++ b/src/systems/attacking.rs @@ -61,7 +61,9 @@ impl <'a> System<'a> for Attacking { let mut attackers = Vec::new(); let mut attacker_names = Vec::new(); for attack in attacked.messages.drain(..) { - let actor_name = attack.attacker.map(|ae| visibles.get(ae)).flatten().map(|v| v.name.as_str()).unwrap_or("?").to_string(); + let actor_name = ( + if let Some(Some(n)) = attack.attacker.map(|ae| visibles.get(ae).map(|v| v.name.as_str())) {n} else {"?"} + ).to_string(); match attack.typ { AttackType::Attack(strength) => { let damage = rand::thread_rng().gen_range(0, strength+1); -- cgit