diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-15 13:09:41 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-15 14:56:58 +0200 |
| commit | ebe328d1724a63c6d93df2155195ba7c5558fde2 (patch) | |
| tree | 78a6f14dc59eedea90f7065989ccf04164378dc5 /talpid-future | |
| parent | de3b988970d47625cffb4497d4d425fa3a6d0a4b (diff) | |
| download | mullvadvpn-ebe328d1724a63c6d93df2155195ba7c5558fde2.tar.xz mullvadvpn-ebe328d1724a63c6d93df2155195ba7c5558fde2.zip | |
Fix `collapsible_if` clippy lint
Diffstat (limited to 'talpid-future')
| -rw-r--r-- | talpid-future/src/retry.rs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/talpid-future/src/retry.rs b/talpid-future/src/retry.rs index f2d7d2a3e2..def46d5bc2 100644 --- a/talpid-future/src/retry.rs +++ b/talpid-future/src/retry.rs @@ -18,12 +18,13 @@ pub async fn retry_future< ) -> T { loop { let current_result = factory().await; - if should_retry(¤t_result) { - if let Some(delay) = delays.next() { - sleep(delay).await; - continue; - } + if should_retry(¤t_result) + && let Some(delay) = delays.next() + { + sleep(delay).await; + continue; } + return current_result; } } @@ -50,11 +51,12 @@ impl Iterator for ConstantInterval { type Item = Duration; fn next(&mut self) -> Option<Duration> { - if let Some(max_attempts) = self.max_attempts { - if self.attempt >= max_attempts { - return None; - } + if let Some(max_attempts) = self.max_attempts + && self.attempt >= max_attempts + { + return None; } + self.attempt = self.attempt.saturating_add(1); Some(self.interval) } @@ -92,10 +94,10 @@ impl ExponentialBackoff { fn next_delay(&mut self) -> Duration { let next = self.next; - if let Some(max_delay) = self.max_delay { - if next > max_delay { - return max_delay; - } + if let Some(max_delay) = self.max_delay + && next > max_delay + { + return max_delay; } self.next = next.saturating_mul(self.factor); |
