Merge branch 'upgrades_20230717' into 'main'

Mid-month dependency upgrades

See merge request tpo/core/arti!1412
This commit is contained in:
Alexander Færøy 2023-07-17 20:19:59 +00:00
commit bd21ea34c2
4 changed files with 25 additions and 34 deletions

53
Cargo.lock generated
View File

@ -154,7 +154,7 @@ dependencies = [
"futures",
"humantime 2.1.0",
"humantime-serde",
"itertools 0.11.0",
"itertools",
"libc",
"notify",
"once_cell",
@ -1083,9 +1083,9 @@ dependencies = [
[[package]]
name = "derive-adhoc"
version = "0.6.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bf4f1be2a84b4ba6f6443854fc9c3b8942ee3ffadadc7106fa777659a946cd4"
checksum = "f67099c8db34a9fde66880bfccd24d6e401c0f643a04684dce963e97a25fd621"
dependencies = [
"derive-adhoc-macros",
"heck",
@ -1093,12 +1093,12 @@ dependencies = [
[[package]]
name = "derive-adhoc-macros"
version = "0.6.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a7134a81d247901c0d03ef80194867644796cd8f858e82bf1b433dfc1c35485"
checksum = "000cc7aebd29aee731e7a8ce69426c15e2e64dd2942ce0bbdde885410c6acd3a"
dependencies = [
"heck",
"itertools 0.10.5",
"itertools",
"proc-macro-crate",
"proc-macro2",
"quote",
@ -2044,15 +2044,6 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
name = "itertools"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.11.0"
@ -3077,9 +3068,9 @@ dependencies = [
[[package]]
name = "rlimit"
version = "0.9.1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8a29d87a652dc4d43c586328706bb5cdff211f3f39a530f240b53f7221dab8e"
checksum = "9b5b8be0bc0ef630d24f8fa836b3a3463479b2343b29f9a8fa905c71a8c7b69b"
dependencies = [
"libc",
]
@ -4186,7 +4177,7 @@ dependencies = [
"futures",
"futures-await-test",
"hex-literal",
"itertools 0.11.0",
"itertools",
"postage",
"rand 0.8.5",
"safelog",
@ -4233,7 +4224,7 @@ dependencies = [
"futures",
"futures-await-test",
"humantime-serde",
"itertools 0.11.0",
"itertools",
"once_cell",
"pin-project",
"rand 0.8.5",
@ -4272,7 +4263,7 @@ dependencies = [
"educe",
"either",
"fs-mistrust",
"itertools 0.11.0",
"itertools",
"once_cell",
"paste",
"regex",
@ -4324,7 +4315,7 @@ dependencies = [
"http",
"httparse",
"httpdate",
"itertools 0.11.0",
"itertools",
"memchr",
"thiserror",
"tor-circmgr",
@ -4359,7 +4350,7 @@ dependencies = [
"hex-literal",
"humantime 2.1.0",
"humantime-serde",
"itertools 0.11.0",
"itertools",
"memmap2",
"once_cell",
"paste",
@ -4446,7 +4437,7 @@ dependencies = [
"futures",
"humantime 2.1.0",
"humantime-serde",
"itertools 0.11.0",
"itertools",
"num_enum",
"pin-project",
"postage",
@ -4483,7 +4474,7 @@ dependencies = [
"either",
"futures",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"postage",
"rand 0.8.5",
"rand_core 0.6.4",
@ -4528,7 +4519,7 @@ dependencies = [
"hex",
"hex-literal",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"paste",
"rand 0.8.5",
"rand_core 0.6.4",
@ -4567,7 +4558,7 @@ dependencies = [
"downcast-rs",
"dyn-clone",
"fs-mistrust",
"itertools 0.10.5",
"itertools",
"serde",
"ssh-key",
"tempfile",
@ -4592,7 +4583,7 @@ dependencies = [
"educe",
"hex",
"hex-literal",
"itertools 0.11.0",
"itertools",
"safelog",
"serde",
"serde_test",
@ -4655,7 +4646,7 @@ dependencies = [
"hex",
"hex-literal",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"num_enum",
"rand 0.8.5",
"rand_chacha 0.3.1",
@ -4697,7 +4688,7 @@ dependencies = [
"hex",
"hex-literal",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"once_cell",
"phf",
"rand 0.8.5",
@ -4761,7 +4752,7 @@ dependencies = [
"hkdf",
"hmac",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"pin-project",
"rand 0.8.5",
"rand_core 0.6.4",
@ -4877,7 +4868,7 @@ dependencies = [
"futures",
"futures-await-test",
"humantime 2.1.0",
"itertools 0.11.0",
"itertools",
"pin-project",
"rand 0.8.5",
"slotmap",

View File

@ -106,7 +106,7 @@ libc = "0.2"
notify = { version = "6.0", default-features = false, features = ["macos_kqueue"] }
once_cell = { version = "1", optional = true }
paste = "1"
rlimit = "0.9.0"
rlimit = "0.10.0"
safelog = { path = "../safelog", version = "0.3.2" }
secmem-proc = { version = "0.3.0", optional = true }
serde = { version = "1.0.103", features = ["derive"] }

View File

@ -29,7 +29,7 @@ derive_more = "0.99.3"
downcast-rs = "1.2.0"
dyn-clone = "1.0.11"
fs-mistrust = { path = "../fs-mistrust", version = "0.7.1", features = ["serde", "walkdir"] }
itertools = "0.10.1"
itertools = "0.11.0"
serde = { version = "1.0.103", features = ["derive"] }
ssh-key = { version = "0.5.1", features = ["std"] }
thiserror = "1"

View File

@ -14,7 +14,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
[dependencies]
amplify = { version = "4", default-features = false, features = ["derive"] }
async-trait = "0.1.54"
derive-adhoc = "0.6"
derive-adhoc = "0.7"
educe = "0.4.6"
futures = "0.3.14"
humantime = "2"