Update dependencies

* Mostly upgrade to serde 1.0
* Pull in lots of other updates for other small deps

Cargo.toml

@@ -9,12 +9,12 @@ repository = "https://github.com/mozilla/sccache/"
 
 [dependencies]
 app_dirs = "1.1.1"
-bincode = { git = 'https://github.com/TyOverby/bincode' }
+bincode = "0.8"
 byteorder = "1.0"
-chrono = { version = "0.2.25", optional = true }
-clap = "~2.23.0"
-env_logger = "0.3.3"
-error-chain = { version = "0.7.2", default-features = false }
+chrono = { version = "0.3", optional = true }
+clap = "2.23.0"
+env_logger = "0.4"
+error-chain = { version = "0.10", default-features = false }
 fern = "0.3.5"
 filetime = "0.1"
 futures = "0.1.11"
@@ -27,14 +27,14 @@ log = "0.3.6"
 lru-disk-cache = { path = "lru-disk-cache" }
 number_prefix = "0.2.5"
 redis = { version = "0.8.0", optional = true }
-regex = "0.1.65"
+regex = "0.2"
 retry = "0.4.0"
 ring = "0.9.0"
 rust-crypto = { version = "0.2.36", optional = true }
 rustc-serialize = "0.3"
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = { version = "0.9.0", optional = true }
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = { version = "1.0", optional = true }
 tempdir = "0.3.4"
 tempfile = "2.1.5"
 time = "0.1.35"
@@ -45,13 +45,13 @@ tokio-proto = "0.1"
 tokio-serde-bincode = { git = "https://github.com/alexcrichton/tokio-serde-bincode" }
 tokio-service = "0.1"
 tokio-tls = "0.1"
-uuid = { version = "0.3.1", features = ["v4"] }
-which = "0.2.1"
+uuid = { version = "0.5", features = ["v4"] }
+which = "1.0"
 zip = { version = "0.2", default-features = false }
 
 [dev-dependencies]
 gcc = "0.3"
-itertools = "0.5.10"
+itertools = "0.6"
 
 [target.'cfg(unix)'.dependencies]
 daemonize = "0.2.3"

lru-disk-cache/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 authors = ["Ted Mielczarek <ted@mielczarek.org>"]
 
 [dependencies]
-env_logger = "0.3.3"
 filetime = "0.1"
 log = "0.3.6"
 lru-cache = { git = "https://github.com/luser/lru-cache", branch = "non-mut-get" }

lru-disk-cache/src/lib.rs

@@ -1,4 +1,3 @@
-extern crate env_logger;
 extern crate filetime;
 #[macro_use]
 extern crate log;

src/cache/cache.rs

@@ -173,9 +173,13 @@ pub trait Storage {
 fn parse_size(val: &str) -> Option<usize> {
     let re = Regex::new(r"^(\d+)([KMGT])$").unwrap();
     re.captures(val)
-        .and_then(|caps| caps.at(1).and_then(|size| usize::from_str(size).ok()).and_then(|size| Some((size, caps.at(2)))))
+        .and_then(|caps| {
+            caps.get(1)
+                .and_then(|size| usize::from_str(size.as_str()).ok())
+                .and_then(|size| Some((size, caps.get(2))))
+        })
         .and_then(|(size, suffix)| {
-            match suffix {
+            match suffix.map(|s| s.as_str()) {
                 Some("K") => Some(1024 * size),
                 Some("M") => Some(1024 * 1024 * size),
                 Some("G") => Some(1024 * 1024 * 1024 * size),

src/simples3/credential.rs

@@ -231,7 +231,7 @@ fn parse_credentials_file(file_path: &Path) -> Result<HashMap<String, AwsCredent
             secret_key = None;
 
             let caps = profile_regex.captures(&unwrapped_line).unwrap();
-            profile_name = Some(caps.at(1).unwrap().to_string());
+            profile_name = Some(caps.get(1).unwrap().as_str().to_string());
             continue;
         }
 

src/simples3/s3.rs

@@ -81,7 +81,7 @@ impl Bucket {
         Box::new(self.client.get(url.parse().unwrap()).chain_err(move || {
             format!("failed GET: {}", url)
         }).and_then(|res| {
-            if res.status().class() == hyper::status::StatusClass::Success {
+            if res.status().is_success() {
                 let content_length = res.headers().get::<header::ContentLength>()
                     .map(|&header::ContentLength(len)| len);
                 Ok((res.body(), content_length))
@@ -142,7 +142,7 @@ impl Bucket {
         Box::new(self.client.request(request).then(|result| {
             match result {
                 Ok(res) => {
-                    if res.status().class() == hyper::status::StatusClass::Success {
+                    if res.status().is_success() {
                         trace!("PUT succeeded");
                         Ok(())
                     } else {