This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-rs-object-store.git


The following commit(s) were added to refs/heads/main by this push:
     new 8c1cd84  fix: restore 1.85 MSRV and fix MSRV CI (#812)
8c1cd84 is described below

commit 8c1cd84d4eeab5ae78ae2fc79d3fd39bca5cf844
Author: Lachy Deakin <[email protected]>
AuthorDate: Tue Aug 18 06:32:19 2026 +1000

    fix: restore 1.85 MSRV and fix MSRV CI (#812)
    
    * fix(CI): verify MSRV with all features
    
    * fix: avoid let chains in `token.rs`
---
 .github/workflows/rust.yml |  2 +-
 src/client/token.rs        | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 301c72f..2cc842a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -55,4 +55,4 @@ jobs:
       - name: Check
         run: |
           # run `cargo msrv verify` to see problems
-          cargo msrv verify --output-format=json || exit 1
+          cargo msrv verify --all-features --output-format=json || exit 1
diff --git a/src/client/token.rs b/src/client/token.rs
index 7743213..4fc0454 100644
--- a/src/client/token.rs
+++ b/src/client/token.rs
@@ -78,18 +78,18 @@ impl<T: Clone + Send + Sync> TokenCache<T> {
             })
         };
 
-        if let Some(cache) = self.cache.read().await.as_ref()
-            && is_token_valid(cache)
-        {
-            return Ok(cache.token.token.clone());
+        if let Some(cache) = self.cache.read().await.as_ref() {
+            if is_token_valid(cache) {
+                return Ok(cache.token.token.clone());
+            }
         }
 
         let mut guard = self.cache.write().await;
-        if let Some(cache) = guard.as_ref()
-            && is_token_valid(cache)
-        {
-            // Refresh race
-            return Ok(cache.token.token.clone());
+        if let Some(cache) = guard.as_ref() {
+            if is_token_valid(cache) {
+                // Refresh race
+                return Ok(cache.token.token.clone());
+            }
         }
 
         let cached = f().await?;

Reply via email to