iresult->result in more places

derive/src/event.rs

@@ -75,14 +75,14 @@ impl Derivable for Event {
 
         Ok(
             quote_spanned!(span => impl #impl_generics Event<#lifetime> for #struct_ident #ty_generics #where_clause {
-                    fn parse(input: & #lifetime str) -> IResult<Self> {
+                    fn parse(input: & #lifetime str) -> Result<Self> {
                         #(#required_fields)*
 
                         #initiator
 
                         #update
 
-                        Ok(("", event))
+                        Ok(event)
                     }
                 }
             ),

derive/src/events.rs

@@ -26,7 +26,6 @@ impl Derivable for Events {
         Ok(
             quote_spanned!(span => impl #impl_generics #enum_ident #ty_generics #where_clause {
                 pub fn parse(raw: &RawEvent<'a>) -> Result<Self, GameEventError> {
-                    dbg!(raw);
                     Ok(match raw.ty {
                         #(#variants)*
                         _ => {

src/event/game.rs

@@ -1,6 +1,6 @@
 use crate::event::{param_parse_with, parse_field, ParamIter};
 use crate::raw_event::RawSubject;
-use crate::{Error, Event, IResult};
+use crate::{Error, Event, Result};
 
 use crate::parsing::{skip, take_until};
 
@@ -30,12 +30,12 @@ pub struct TournamentModeStartedEvent<'a> {
 }
 
 impl<'a> Event<'a> for TournamentModeStartedEvent<'a> {
-    fn parse(input: &'a str) -> IResult<Self> {
+    fn parse(input: &'a str) -> Result<Self> {
         let input = skip(input, "\nBlue Team: ".len())?;
         let (input, blue) = take_until(input, b'\n');
         let input = skip(input, "\nRed Team: ".len())?;
-        let (input, red) = take_until(input, b'\n');
+        let (_, red) = take_until(input, b'\n');
-        Ok((input, TournamentModeStartedEvent { blue, red }))
+        Ok(TournamentModeStartedEvent { blue, red })
     }
 }
 
@@ -56,7 +56,7 @@ pub struct PointCapturedEvent<'a> {
 }
 
 impl<'a> Event<'a> for PointCapturedEvent<'a> {
-    fn parse(input: &'a str) -> IResult<Self> {
+    fn parse(input: &'a str) -> Result<Self> {
         let mut cp = Default::default();
         let mut cp_name = Default::default();
         let mut num_cappers = Default::default();
@@ -94,15 +94,12 @@ impl<'a> Event<'a> for PointCapturedEvent<'a> {
             }
         }
 
-        Ok((
+        Ok(PointCapturedEvent {
-            input,
+            cp,
-            PointCapturedEvent {
+            num_cappers,
-                cp,
+            cp_name,
-                num_cappers,
+            players,
-                cp_name,
+        })
-                players,
-            },
-        ))
     }
 }
 

src/event/medic.rs

@@ -1,6 +1,6 @@
 use crate::event::{param_parse_with, parse_field, ParamIter};
 use crate::raw_event::RawSubject;
-use crate::{Event, IResult};
+use crate::{Event, Result};
 
 #[derive(Debug, Event)]
 pub struct HealedEvent<'a> {

src/event/mod.rs

@@ -29,22 +29,21 @@ trait GameEventErrTrait<T> {
     fn with_raw(self, raw: &RawEvent) -> Result<T, GameEventError>;
 }
 
-impl<'a, T> GameEventErrTrait<T> for IResult<'a, T> {
+impl<'a, T> GameEventErrTrait<T> for Result<T> {
     fn with_raw(self, raw: &RawEvent) -> Result<T, GameEventError> {
         self.map_err(|err| GameEventError::Error {
             err: Box::new(err),
             ty: raw.ty,
             params: raw.params.to_string(),
         })
-        .map(|(_rest, t)| t)
     }
 }
 
 pub trait Event<'a>: Sized + 'a {
-    fn parse(input: &'a str) -> IResult<Self>;
+    fn parse(input: &'a str) -> Result<Self>;
 }
 
-fn parse_event<'a, T: Event<'a>>(input: &'a str) -> IResult<T> {
+fn parse_event<'a, T: Event<'a>>(input: &'a str) -> Result<T> {
     T::parse(input)
 }
 
@@ -111,8 +110,8 @@ pub struct UnparsedEvent<'a> {
 }
 
 impl<'a> Event<'a> for UnparsedEvent<'a> {
-    fn parse(input: &'a str) -> IResult<Self> {
+    fn parse(input: &'a str) -> Result<Self> {
-        Ok(("", UnparsedEvent { params: input }))
+        Ok(UnparsedEvent { params: input })
     }
 }
 

src/event/player.rs

@@ -1,7 +1,7 @@
 use crate::common::{Class, Team};
 use crate::event::{param_parse_with, parse_field, quoted, ParamIter};
 use crate::raw_event::RawSubject;
-use crate::{Error, Event, IResult};
+use crate::{Error, Event, Result};
 use std::net::SocketAddr;
 use std::num::NonZeroU32;