refactor(context): Abstract lookup for offline flag

Author: epage

src/cargo/sources/git/utils.rs

@@ -955,15 +955,12 @@ pub fn fetch(
     gctx: &GlobalContext,
     remote_kind: RemoteKind,
 ) -> CargoResult<()> {
-    if gctx.frozen() {
+    if let Some(offline_flag) = gctx.offline_flag() {
         anyhow::bail!(
-            "attempting to update a git repository, but --frozen \
+            "attempting to update a git repository, but {offline_flag} \
              was specified"
         )
     }
-    if !gctx.network_allowed() {
-        anyhow::bail!("can't update a git repository in the offline mode")
-    }
 
     let shallow = remote_kind.to_shallow_setting(repo.is_shallow(), gctx);
 

src/cargo/util/context/mod.rs

@@ -1161,7 +1161,17 @@ impl GlobalContext {
     }
 
     pub fn network_allowed(&self) -> bool {
-        !self.frozen() && !self.offline()
+        !self.offline_flag().is_some()
+    }
+
+    pub fn offline_flag(&self) -> Option<&'static str> {
+        if self.frozen {
+            Some("--frozen")
+        } else if self.offline {
+            Some("--offline")
+        } else {
+            None
+        }
     }
 
     pub fn offline(&self) -> bool {

src/cargo/util/network/http.rs

@@ -25,15 +25,9 @@ pub fn http_handle(gctx: &GlobalContext) -> CargoResult<Easy> {
 }
 
 pub fn http_handle_and_timeout(gctx: &GlobalContext) -> CargoResult<(Easy, HttpTimeout)> {
-    if gctx.frozen() {
+    if let Some(offline_flag) = gctx.offline_flag() {
         bail!(
-            "attempting to make an HTTP request, but --frozen was \
-             specified"
-        )
-    }
-    if gctx.offline() {
-        bail!(
-            "attempting to make an HTTP request, but --offline was \
+            "attempting to make an HTTP request, but {offline_flag} was \
              specified"
         )
     }