mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

cargo: upgrade to backoff 0.3

Browse source 
For no particular reason other than to stay up to date.
This commit is contained in:
Martin von Zweigbergk 2021-12-01 07:19:05 -08:00
parent ba01c512ae
commit 905c45ddd7
3 changed files with 22 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
Cargo.lock generated
View file

@ -45,12 +45,13 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]] [[package]]
name = "backoff" name = "backoff"
version = "0.2.1" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "721c249ab59cbc483ad4294c9ee2671835c1e43e9ffc277e6b4ecfef733cfdc5" checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625"
dependencies = [ dependencies = [
"getrandom",
"instant", "instant",
"rand 0.7.3", "rand",
] ]
[[package]] [[package]]
@ -386,17 +387,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "getrandom"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.3" version = "0.2.3"
@ -405,7 +395,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"wasi 0.10.0+wasi-snapshot-preview1", "wasi",
] ]
[[package]] [[package]]
@ -536,7 +526,7 @@ dependencies = [
"pest_derive", "pest_derive",
"protobuf", "protobuf",
"protobuf-codegen-pure", "protobuf-codegen-pure",
"rand 0.8.4", "rand",
"regex", "regex",
"serde_json", "serde_json",
"tempfile", "tempfile",
@ -567,7 +557,7 @@ dependencies = [
"pest_derive", "pest_derive",
"protobuf", "protobuf",
"protobuf-codegen-pure", "protobuf-codegen-pure",
"rand 0.8.4", "rand",
"regex", "regex",
"serde_json", "serde_json",
"tempfile", "tempfile",
@ -916,19 +906,6 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "rand"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
"getrandom 0.1.16",
"libc",
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc 0.2.0",
]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.8.4" version = "0.8.4"
@ -936,19 +913,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [ dependencies = [
"libc", "libc",
"rand_chacha 0.3.1", "rand_chacha",
"rand_core 0.6.3", "rand_core",
"rand_hc 0.3.1", "rand_hc",
]
[[package]]
name = "rand_chacha"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [
"ppv-lite86",
"rand_core 0.5.1",
] ]
[[package]] [[package]]
@ -958,16 +925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [ dependencies = [
"ppv-lite86", "ppv-lite86",
"rand_core 0.6.3", "rand_core",
]
[[package]]
name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
"getrandom 0.1.16",
] ]
[[package]] [[package]]
@ -976,16 +934,7 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [ dependencies = [
"getrandom 0.2.3", "getrandom",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core 0.5.1",
] ]
[[package]] [[package]]
@ -994,7 +943,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
dependencies = [ dependencies = [
"rand_core 0.6.3", "rand_core",
] ]
[[package]] [[package]]
@ -1037,7 +986,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [ dependencies = [
"getrandom 0.2.3", "getrandom",
"redox_syscall", "redox_syscall",
] ]
@ -1248,7 +1197,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"rand 0.8.4", "rand",
"redox_syscall", "redox_syscall",
"remove_dir_all", "remove_dir_all",
"winapi", "winapi",
@ -1314,7 +1263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [ dependencies = [
"libc", "libc",
"wasi 0.10.0+wasi-snapshot-preview1", "wasi",
"winapi", "winapi",
] ]
@ -1427,7 +1376,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [ dependencies = [
"getrandom 0.2.3", "getrandom",
] ]
[[package]] [[package]]
@ -1459,12 +1408,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.10.0+wasi-snapshot-preview1" version = "0.10.0+wasi-snapshot-preview1"

2
lib/Cargo.toml
View file

@ -16,7 +16,7 @@ readme = "../README.md"
protobuf-codegen-pure = "2.22.1" protobuf-codegen-pure = "2.22.1"
[dependencies] [dependencies]
backoff = "0.2.1" backoff = "0.3.0"
blake2 = "0.9.1" blake2 = "0.9.1"
bytes = "1.0.0" bytes = "1.0.0"
byteorder = "1.3.4" byteorder = "1.3.4"

8
lib/src/lock.rs
View file

@ -16,7 +16,7 @@ use std::fs::{File, OpenOptions};
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Duration; use std::time::Duration;
use backoff::{ExponentialBackoff, Operation}; use backoff::{retry, ExponentialBackoff};
pub struct FileLock { pub struct FileLock {
path: PathBuf, path: PathBuf,
@ -28,7 +28,7 @@ impl FileLock {
let mut options = OpenOptions::new(); let mut options = OpenOptions::new();
options.create_new(true); options.create_new(true);
options.write(true); options.write(true);
let mut try_write_lock_file = || match options.open(&path) { let try_write_lock_file = || match options.open(&path) {
Ok(file) => Ok(FileLock { Ok(file) => Ok(FileLock {
path: path.clone(), path: path.clone(),
_file: file, _file: file,
@ -41,12 +41,12 @@ impl FileLock {
} }
Err(err) => Err(backoff::Error::Permanent(err)), Err(err) => Err(backoff::Error::Permanent(err)),
}; };
let mut backoff = ExponentialBackoff { let backoff = ExponentialBackoff {
initial_interval: Duration::from_millis(1), initial_interval: Duration::from_millis(1),
max_elapsed_time: Some(Duration::from_secs(10)), max_elapsed_time: Some(Duration::from_secs(10)),
..Default::default() ..Default::default()
}; };
match try_write_lock_file.retry(&mut backoff) { match retry(backoff, try_write_lock_file) {
Err(err) => panic!( Err(err) => panic!(
"failed to create lock file {}: {}", "failed to create lock file {}: {}",
path.to_string_lossy(), path.to_string_lossy(),