diff -r a0c3431f60ac -r da71e0d88a1c gameServer2/src/protocol/mod.rs --- a/gameServer2/src/protocol/mod.rs Tue Jul 03 23:05:09 2018 +0300 +++ b/gameServer2/src/protocol/mod.rs Wed Jul 04 00:01:25 2018 +0300 @@ -1,7 +1,10 @@ use netbuf; -use std::io::Read; -use std::io::Result; -use nom::IResult; +use std::{ + io::{Read, Result} +}; +use nom::{ + IResult, Err +}; pub mod messages; pub mod test; @@ -27,12 +30,12 @@ pub fn extract_messages(&mut self) -> Vec { let parse_result = parser::extract_messages(&self.buf[..]); match parse_result { - IResult::Done(tail, msgs) => { + Ok((tail, msgs)) => { self.consumed = self.buf.len() - self.consumed - tail.len(); msgs }, - IResult::Incomplete(_) => unreachable!(), - IResult::Error(_) => unreachable!(), + Err(Err::Incomplete(_)) => unreachable!(), + Err(Err::Error(_)) | Err(Err::Failure(_)) => unreachable!(), } }