diff --git a/src/types/eui48.rs b/src/types/eui48.rs index 8c3dc22b..0aea4e98 100644 --- a/src/types/eui48.rs +++ b/src/types/eui48.rs @@ -6,12 +6,11 @@ use self::eui48::MacAddress; use types::{FromSql, ToSql, Type, IsNull, SessionInfo}; use Result; -use util; impl FromSql for MacAddress { fn from_sql(_: &Type, raw: &mut R, _: &SessionInfo) -> Result { let mut bytes = [0; 6]; - try!(util::read_all(raw, &mut bytes)); + try!(raw.read_exact(&mut bytes)); Ok(MacAddress::new(bytes)) } diff --git a/src/types/uuid.rs b/src/types/uuid.rs index 73cdccf6..cbc6f9a1 100644 --- a/src/types/uuid.rs +++ b/src/types/uuid.rs @@ -5,12 +5,11 @@ use std::io::prelude::*; use self::uuid::Uuid; use types::{FromSql, ToSql, Type, IsNull, SessionInfo}; use Result; -use util; impl FromSql for Uuid { fn from_sql(_: &Type, raw: &mut R, _: &SessionInfo) -> Result { let mut bytes = [0; 16]; - try!(util::read_all(raw, &mut bytes)); + try!(raw.read_exact(&mut bytes)); Ok(Uuid::from_bytes(&bytes).unwrap()) }