From 866298c94864aef48206521e2d9d57a85a1ad88c Mon Sep 17 00:00:00 2001
From: Rodolphe Breard <rodolphe@what.tf>
Date: Sun, 3 Mar 2019 15:23:31 +0100
Subject: [PATCH] Updating nom to 4.2

---
 opensmtpd/Cargo.toml   | 2 +-
 opensmtpd/src/entry.rs | 8 ++------
 opensmtpd/src/lib.rs   | 8 +++-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/opensmtpd/Cargo.toml b/opensmtpd/Cargo.toml
index 2e14637..ad58d92 100644
--- a/opensmtpd/Cargo.toml
+++ b/opensmtpd/Cargo.toml
@@ -13,7 +13,7 @@ include = ["src/**/*", "Cargo.toml", "LICENSE-*.txt"]
 
 [dependencies]
 log = {version = "0.4", features = ["std"]}
-nom = "4.1"
+nom = "4.2"
 opensmtpd_derive = { path = "../opensmtpd-derive", version = "0.1" }
 
 [[example]]
diff --git a/opensmtpd/src/entry.rs b/opensmtpd/src/entry.rs
index c4e0372..954d1a6 100644
--- a/opensmtpd/src/entry.rs
+++ b/opensmtpd/src/entry.rs
@@ -7,10 +7,7 @@
 // except according to those terms.
 
 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 nom::{alt_complete, call, cond, do_parse, map_res, named, opt, tag, take_until, take_while};
 use std::str::FromStr;
 
 #[derive(Clone, Debug, PartialEq)]
@@ -48,8 +45,7 @@ impl FromStr for Event {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let s = s
-            .to_lowercase()
+        let s = s.to_lowercase()
             .replace("link", "link-")
             .replace("tx", "tx-")
             .replace("protocol", "protocol-")
diff --git a/opensmtpd/src/lib.rs b/opensmtpd/src/lib.rs
index 9588439..4d307e3 100644
--- a/opensmtpd/src/lib.rs
+++ b/opensmtpd/src/lib.rs
@@ -89,11 +89,9 @@ impl<T: Clone + Default + 'static> SmtpIn<T> {
         let mut evts = Vec::new();
         for eh in self.event_handlers.iter() {
             match eh.event {
-                MatchEvent::Evt(ref v) => {
-                    for e in v.iter() {
-                        evts.push(e);
-                    }
-                }
+                MatchEvent::Evt(ref v) => for e in v.iter() {
+                    evts.push(e);
+                },
                 MatchEvent::All => {
                     println!("register|report|smtp-in|*");
                     evts.clear();