From bef90f314bb52d139bb89b317803fa1a2904cd4e Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 22 May 2018 15:54:31 -0700
Subject: [PATCH] Simplify net.retry config.

---
 src/cargo/util/config.rs  | 7 -------
 src/cargo/util/network.rs | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index aadddc848..47625aebe 100644
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -508,13 +508,6 @@ impl Config {
         }
     }
 
-    pub fn net_retry(&self) -> CargoResult<i64> {
-        match self.get::<Option<u32>>("net.retry")? {
-            Some(v) => Ok(v as i64),
-            None => Ok(2),
-        }
-    }
-
     // TODO: why is this pub?
     pub fn expected<T>(&self, ty: &str, key: &str, val: CV) -> CargoResult<T> {
         val.expected(ty, key)
diff --git a/src/cargo/util/network.rs b/src/cargo/util/network.rs
index e789a929d..55b18a4cd 100644
--- a/src/cargo/util/network.rs
+++ b/src/cargo/util/network.rs
@@ -48,7 +48,7 @@ pub fn with_retry<T, F>(config: &Config, mut callback: F) -> CargoResult<T>
 where
     F: FnMut() -> CargoResult<T>,
 {
-    let mut remaining = config.net_retry()?;
+    let mut remaining = config.get::<Option<u32>>("net.retry")?.unwrap_or(2);
     loop {
         match callback() {
             Ok(ret) => return Ok(ret),
-- 
2.30.2