# HG changeset patch
# User alfadur
# Date 1530133815 -10800
# Node ID 4c5ed27b1ff888726aced9b6329d68e428c48bde
# Parent  c8425fbcf1d9ba435f8bca98b0f70b98110b379a
stabilization

diff -r c8425fbcf1d9 -r 4c5ed27b1ff8 gameServer2/src/main.rs
--- a/gameServer2/src/main.rs	Wed Jun 27 23:51:00 2018 +0300
+++ b/gameServer2/src/main.rs	Thu Jun 28 00:10:15 2018 +0300
@@ -1,7 +1,6 @@
 #![allow(unused_imports)]
 #![deny(bare_trait_objects)]
 #![warn(unreachable_pub)]
-#![feature(slice_patterns)]
 
 extern crate rand;
 extern crate mio;
diff -r c8425fbcf1d9 -r 4c5ed27b1ff8 gameServer2/src/server/handlers/inroom.rs
--- a/gameServer2/src/server/handlers/inroom.rs	Wed Jun 27 23:51:00 2018 +0300
+++ b/gameServer2/src/server/handlers/inroom.rs	Thu Jun 28 00:10:15 2018 +0300
@@ -41,6 +41,7 @@
     b"M#+LlRrUuDdZzAaSjJ,NpPwtgfhbc12345\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A";
 const NON_TIMED_MESSAGES: &[u8] = b"M#hb";
 
+#[cfg(canhazslicepatterns)]
 fn is_msg_valid(msg: &[u8], team_indices: &[u8]) -> bool {
     match msg {
         [size, typ, body..] => VALID_MESSAGES.contains(typ)
@@ -52,11 +53,16 @@
     }
 }
 
+fn is_msg_valid(msg: &[u8], team_indices: &[u8]) -> bool {
+    if let Some(typ) = msg.get(1) {
+        VALID_MESSAGES.contains(typ)
+    } else {
+        false
+    }
+}
+
 fn is_msg_empty(msg: &[u8]) -> bool {
-    match msg {
-        [_, b'+', ..] => true,
-        _ => false
-    }
+    msg.get(1).filter(|t| **t == b'+').is_some()
 }
 
 pub fn handle(server: &mut HWServer, client_id: ClientId, message: HWProtocolMessage) {
@@ -240,11 +246,7 @@
                     let messages = by_msg(&decoding);
                     let valid = messages.clone().filter(|m| is_msg_valid(m, &c.team_indices));
                     let non_empty = messages.filter(|m| !is_msg_empty(m));
-                    let last_msg = valid.clone().scan(None, |res, msg| match msg {
-                        [_, b'+', ..] => Some(msg),
-                        [_, typ, ..] if NON_TIMED_MESSAGES.contains(typ) => *res,
-                        _ => None
-                    }).next().map(|s| encode(s));
+                    let last_msg = None;
 
                     let em_response = encode(&valid.flat_map(|msg| msg).cloned().collect::<Vec<_>>());
                     if !em_response.is_empty() {
@@ -253,7 +255,7 @@
                     }
                     let em_log = encode(&non_empty.flat_map(|msg| msg).cloned().collect::<Vec<_>>());
                     if let Some(ref mut info) = r.game_info {
-                        if (!em_log.is_empty()) {
+                        if !em_log.is_empty() {
                             info.msg_log.push(em_log);
                         }
                         if last_msg.is_some() {