Consolidate net configuration into a typed structure

Less need for `get_bool` and friends!

Author: alexcrichton

src/cargo/sources/git/utils.rs

@@ -707,10 +707,8 @@ pub fn fetch(
     // repositories instead of `libgit2`-the-library. This should make more
     // flavors of authentication possible while also still giving us all the
     // speed and portability of using `libgit2`.
-    if let Some(val) = config.get_bool("net.git-fetch-with-cli")? {
-        if val.val {
-            return fetch_with_cli(repo, url, refspec, config);
-        }
+    if let Some(true) = config.net_config()?.git_fetch_with_cli {
+        return fetch_with_cli(repo, url, refspec, config);
     }
 
     debug!("doing a fetch for {}", url);

src/cargo/util/config/mod.rs

@@ -94,8 +94,9 @@ pub struct Config {
     /// Lock, if held, of the global package cache along with the number of
     /// acquisitions so far.
     package_cache_lock: RefCell<Option<(Option<FileLock>, usize)>>,
-    /// HTTP configuration for Cargo
+    /// Cached configuration parsed by Cargo
     http_config: LazyCell<CargoHttpConfig>,
+    net_config: LazyCell<CargoNetConfig>,
 }
 
 impl Config {
@@ -155,6 +156,7 @@ impl Config {
             updated_sources: LazyCell::new(),
             package_cache_lock: RefCell::new(None),
             http_config: LazyCell::new(),
+            net_config: LazyCell::new(),
         }
     }
 
@@ -638,8 +640,9 @@ impl Config {
         self.locked = locked;
         self.offline = offline
             || self
-                .get::<Option<bool>>("net.offline")
-                .unwrap_or(None)
+                .net_config()
+                .ok()
+                .and_then(|n| n.offline)
                 .unwrap_or(false);
         self.target_dir = cli_target_dir;
         self.cli_flags.parse(unstable_flags)?;
@@ -929,6 +932,11 @@ impl Config {
             .try_borrow_with(|| Ok(self.get::<CargoHttpConfig>("http")?))
     }
 
+    pub fn net_config(&self) -> CargoResult<&CargoNetConfig> {
+        self.net_config
+            .try_borrow_with(|| Ok(self.get::<CargoNetConfig>("net")?))
+    }
+
     pub fn crates_io_source_id<F>(&self, f: F) -> CargoResult<SourceId>
     where
         F: FnMut() -> CargoResult<SourceId>,
@@ -1457,3 +1465,11 @@ pub enum SslVersionConfig {
     Single(String),
     Range(SslVersionConfigRange),
 }
+
+#[derive(Debug, Deserialize)]
+pub struct CargoNetConfig {
+    pub retry: Option<u32>,
+    pub offline: Option<bool>,
+    #[serde(rename = "git-fetch-with-cli")]
+    pub git_fetch_with_cli: Option<bool>,
+}

src/cargo/util/network.rs

@@ -15,7 +15,7 @@ impl<'a> Retry<'a> {
     pub fn new(config: &'a Config) -> CargoResult<Retry<'a>> {
         Ok(Retry {
             config,
-            remaining: config.get::<Option<u32>>("net.retry")?.unwrap_or(2),
+            remaining: config.net_config()?.retry.unwrap_or(2),
         })
     }