diff --git a/phases/src/caching.rs b/phases/src/caching.rs index c619b5bce7..012e484ec6 100644 --- a/phases/src/caching.rs +++ b/phases/src/caching.rs @@ -17,10 +17,10 @@ use mononoke_types::{ChangesetId, RepositoryId}; use stats::{define_stats, Timeseries}; use std::{ collections::{HashMap, HashSet}, + convert::TryInto, sync::Arc, time::Duration, }; -use try_from::TryInto; // Memcache constants, should be changed when we want to invalidate memcache // entries diff --git a/phases/src/lib.rs b/phases/src/lib.rs index fc654bb1e7..b6f788a63b 100644 --- a/phases/src/lib.rs +++ b/phases/src/lib.rs @@ -29,9 +29,9 @@ pub use sql_ext::SqlConstructors; use stats::{define_stats, Timeseries}; use std::{ collections::{HashMap, HashSet}, + convert::TryFrom, fmt, }; -use try_from::TryFrom; #[derive(Clone, Copy, PartialEq, Eq, Debug)] pub enum Phase { @@ -58,9 +58,9 @@ impl fmt::Display for Phase { } impl TryFrom for Phase { - type Err = ErrorKind; + type Error = ErrorKind; - fn try_from(buf: iobuf::IOBuf) -> ::std::result::Result { + fn try_from(buf: iobuf::IOBuf) -> ::std::result::Result { let v: Vec = buf.into(); match std::str::from_utf8(&v) { Ok("Draft") => Ok(Phase::Draft),