refactor

Author: Byron

gix-transport/src/client/blocking_io/http/reqwest/remote.rs

@@ -42,32 +42,30 @@ impl Default for Remote {
         let handle = std::thread::spawn(move || -> Result<(), Error> {
             let mut follow = None;
             let mut redirected_base_url = None::<String>;
-
-            // This initial value is just a place holder, it will get modified
-            // before `client.execute` is called.
-            let current_follow_policy = Arc::new(atomic::AtomicBool::new(false));
-
-            let follow_policy = Arc::clone(&current_follow_policy);
+            let allow_redirects = Arc::new(atomic::AtomicBool::new(false));
 
             // We may error while configuring, which is expected as part of the internal protocol. The error will be
             // received and the sender of the request might restart us.
             let client = reqwest::blocking::ClientBuilder::new()
                 .connect_timeout(std::time::Duration::from_secs(20))
                 .http1_title_case_headers()
-                .redirect(reqwest::redirect::Policy::custom(move |attempt| {
-                    if follow_policy.load(atomic::Ordering::Relaxed) {
-                        let curr_url = attempt.url();
-                        let prev_urls = attempt.previous();
+                .redirect(reqwest::redirect::Policy::custom({
+                    let allow_redirects = allow_redirects.clone();
+                    move |attempt| {
+                        if allow_redirects.load(atomic::Ordering::Relaxed) {
+                            let curr_url = attempt.url();
+                            let prev_urls = attempt.previous();
 
-                        match prev_urls.first() {
-                            Some(prev_url) if prev_url.host_str() != curr_url.host_str() => {
-                                // gix does not want to be redirected to a different host.
-                                attempt.stop()
+                            match prev_urls.first() {
+                                Some(prev_url) if prev_url.host_str() != curr_url.host_str() => {
+                                    // git does not want to be redirected to a different host.
+                                    attempt.stop()
+                                }
+                                _ => attempt.follow(),
                             }
-                            _ => attempt.follow(),
+                        } else {
+                            attempt.stop()
                         }
-                    } else {
-                        attempt.stop()
                     }
                 }))
                 .build()?;
@@ -121,12 +119,8 @@ impl Default for Remote {
                 }
 
                 let follow = follow.get_or_insert(config.follow_redirects);
-
-                current_follow_policy.store(
-                    match *follow {
-                        FollowRedirects::None => false,
-                        FollowRedirects::Initial | FollowRedirects::All => true,
-                    },
+                allow_redirects.store(
+                    matches!(follow, FollowRedirects::Initial | FollowRedirects::All),
                     atomic::Ordering::Relaxed,
                 );