Commit 20a69c47 authored by Ian Jackson's avatar Ian Jackson 💬
Browse files

Merge branch 'update' into 'main' 

Dependency updates (release prep)

See merge request tpo/core/arti!3117
parents 83daea5a 032fa8cc

Cargo.lock

+215 −170

File changed.

Preview size limit exceeded, changes collapsed.

crates/arti-client/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ __is_experimental = [] 
anyhow = { version = "1.0.23", optional = true }

async-trait = "0.1.54"

cfg-if = "1.0.0"

derive-deftly = { version = "~1.1.0", features = ["full", "beta"] }

derive-deftly = { version = "~1.2.0", features = ["full", "beta"] }

derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }

derive_more = { version = "2.0.1", features = ["full"] }

dyn-clone = { version = "1.0.11", optional = true }

crates/arti-rpcserver/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ async-trait = "0.1.54" 
asynchronous-codec = { version = "0.7.0", features = ["json"] }

base64ct = "1.5.1"

bytes = "1"

derive-deftly = { version = "~1.1.0", features = ["full", "beta"] }

derive-deftly = { version = "~1.2.0", features = ["full", "beta"] }

derive_more = { version = "2.0.1", features = ["full"] }

erased-serde = "0.4.2"

futures = "0.3.14"

crates/arti/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ async-ctrlc = { version = "1.2.0", optional = true } 
async-signal = { version = "0.2.10", optional = true }

cfg-if = "1.0.0"

clap = { version = "4.3.24", features = ["string", "wrap_help", "derive"] }

derive-deftly = { version = "~1.1.0", features = ["full", "beta"], optional = true }

derive-deftly = { version = "~1.2.0", features = ["full", "beta"], optional = true }

derive_builder = { version = "0.11", package = "derive_builder_fork_arti" }

fs-mistrust = { path = "../fs-mistrust", version = "0.10.0" }

futures = "0.3.14"

crates/tor-async-utils/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ categories = ["rust-patterns"] 
repository = "https://gitlab.torproject.org/tpo/core/arti.git/"



[dependencies]

derive-deftly = { version = "~1.1.0", features = ["full", "beta"] }

derive-deftly = { version = "~1.2.0", features = ["full", "beta"] }

educe = "0.4.22"

futures = "0.3.14"

oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.2.3" }