use hostname-0.1.5 for now (#1)

use hostname-0.1.5 for now

Author: dignifiedquire

Cargo.toml

@@ -23,7 +23,7 @@ nom = { version = "^5.0", optional = true }
 bufstream = { version = "^0.1", optional = true }
 rustls = { version = "^0.16", optional = true }
 base64 = { version = "^0.11", optional = true }
-hostname = { version = "^0.2", optional = true }
+hostname = { version = "0.1.5", optional = true }
 serde = { version = "^1.0", optional = true }
 serde_json = { version = "^1.0", optional = true }
 serde_derive = { version = "^1.0", optional = true }

src/smtp/extension.rs

@@ -4,7 +4,7 @@ use crate::smtp::authentication::Mechanism;
 use crate::smtp::error::Error;
 use crate::smtp::response::Response;
 use crate::smtp::util::XText;
-use hostname::get as get_hostname;
+use hostname::get_hostname;
 use std::collections::HashSet;
 use std::fmt::{self, Display, Formatter};
 use std::net::{Ipv4Addr, Ipv6Addr};
@@ -47,14 +47,7 @@ impl ClientId {
     /// Defines a `ClientId` with the current hostname, of `localhost` if hostname could not be
     /// found
     pub fn hostname() -> ClientId {
-        ClientId::Domain(
-            get_hostname()
-                .map(|s| {
-                    s.into_string()
-                        .unwrap_or_else(|_| DEFAULT_DOMAIN_CLIENT_ID.to_string())
-                })
-                .unwrap_or_else(|_| DEFAULT_DOMAIN_CLIENT_ID.to_string()),
-        )
+        ClientId::Domain(get_hostname().unwrap_or_else(|| DEFAULT_DOMAIN_CLIENT_ID.to_string()))
     }
 }