diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
commit | ef24de24a82fe681581cc130f342363c47c0969a (patch) | |
tree | 0d494f7e1a38b95c92426f58fe6eaa877303a86c /vendor/gix/src/config/tree/keys.rs | |
parent | Releasing progress-linux version 1.74.1+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-ef24de24a82fe681581cc130f342363c47c0969a.tar.xz rustc-ef24de24a82fe681581cc130f342363c47c0969a.zip |
Merging upstream version 1.75.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix/src/config/tree/keys.rs')
-rw-r--r-- | vendor/gix/src/config/tree/keys.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/gix/src/config/tree/keys.rs b/vendor/gix/src/config/tree/keys.rs index 5a5257af5..15cfba2d9 100644 --- a/vendor/gix/src/config/tree/keys.rs +++ b/vendor/gix/src/config/tree/keys.rs @@ -237,7 +237,7 @@ mod lock_timeout { let value = value.map_err(|err| config::lock_timeout::Error::from(self).with_source(err))?; Ok(match value { val if val < 0 => Fail::AfterDurationWithBackoff(Duration::from_secs(u64::MAX)), - val if val == 0 => Fail::Immediately, + 0 => Fail::Immediately, val => Fail::AfterDurationWithBackoff(Duration::from_millis( val.try_into().expect("i64 to u64 always works if positive"), )), |