Properly implement the std::str::FromStr trait

opensmtpd/src/entry.rs

@@ -1,6 +1,7 @@
 use crate::errors::Error;
 use nom::{alt, alt_complete, call, complete, cond, do_parse, error_position, map_res, named, opt,
           tag, take_until, take_while};
+use std::str::FromStr;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum Kind {
@@ -33,8 +34,10 @@ pub enum Event {
     FilterResponse,
 }
 
-impl Event {
+impl FromStr for Event {
-    pub fn from_str(s: &str) -> Result<Event, Error> {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let s = s.to_lowercase()
             .replace("link", "link-")
             .replace("tx", "tx-")
@@ -69,8 +72,10 @@ pub struct Entry {
     pub params: Option<String>,
 }
 
-impl Entry {
+impl FromStr for Entry {
-    pub fn from_str(entry: &str) -> Result<Entry, Error> {
+    type Err = Error;
+
+    fn from_str(entry: &str) -> Result<Self, Self::Err> {
         let (_, res) = parse_entry(entry)?;
         Ok(res)
     }

opensmtpd/src/event_handlers.rs

@@ -1,5 +1,6 @@
 use crate::entry::{Entry, Event};
 use crate::Response;
+use std::str::FromStr;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum MatchEvent {

opensmtpd/src/lib.rs

@@ -5,6 +5,7 @@ mod event_handlers;
 use log::{debug, error, warn};
 use std::collections::HashMap;
 use std::io;
+use std::str::FromStr;
 use std::sync::mpsc;
 use std::thread;