diff -r 0118b7412570 -r 5fb40c8e5542 gameServer2/src/protocol/test.rs --- a/gameServer2/src/protocol/test.rs Fri Sep 07 04:16:05 2018 +0300 +++ b/gameServer2/src/protocol/test.rs Sun Sep 09 01:20:35 2018 +0300 @@ -22,9 +22,6 @@ impl Into2> for Option{ fn into2(self) -> Option { self.map(|x| {x.0}) } } -impl Into2>> for Option>{ - fn into2(self) -> Option> { self.map(|x| {x.into2()}) } -} macro_rules! proto_msg_case { ($val: ident()) => @@ -74,7 +71,7 @@ 4 => Seed(Ascii), 5 => Template(u32), 6 => Ammo(Ascii, Option), - 7 => Scheme(Ascii, Option>), + 7 => Scheme(Ascii, Vec), 8 => Script(Ascii), 9 => Theme(Ascii), 10 => DrawnMap(Ascii))