Commit 8509dbc9 authored by eta's avatar eta
Browse files

Merge branch 'upgrade_dependencies' into 'main' 

Upgrade various dependencies, now that we are MSRV 1.56

Closes #313 and #334

See merge request !476
parents 5484bcc2 0425de10

Cargo.lock

+29 −19
Original line number Original line Diff line number Diff line
@@ -19,15 +19,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" 




[[package]]

[[package]]

name = "aes"

name = "aes"

version = "0.7.5"

version = "0.8.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"

checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba"

dependencies = [

dependencies = [

 "cfg-if 1.0.0",

 "cfg-if 1.0.0",

 "cipher",

 "cipher",

 "cpufeatures",

 "cpufeatures",

 "ctr",

 "opaque-debug",

]

]





[[package]]

[[package]]
@@ -423,9 +421,9 @@ dependencies = [ 




[[package]]

[[package]]

name = "async_executors"

name = "async_executors"

version = "0.4.2"

version = "0.6.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0b13b311cd10e80105651ad640a6741991d147787badb4141e8e1b7fd59816f5"

checksum = "c0b2463773401e1f684136f9cdb956cf611f22172472cf3f049e72123f59e359"

dependencies = [

dependencies = [

 "async-std",

 "async-std",

 "blanket",

 "blanket",
@@ -630,11 +628,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 




[[package]]

[[package]]

name = "cipher"

name = "cipher"

version = "0.3.0"

version = "0.4.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"

checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"

dependencies = [

dependencies = [

 "generic-array",

 "crypto-common",

 "inout",

]

]





[[package]]

[[package]]
@@ -675,9 +674,9 @@ dependencies = [ 




[[package]]

[[package]]

name = "config"

name = "config"

version = "0.12.0"

version = "0.13.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86"

checksum = "3ea917b74b6edfb5024e3b55d3c8f710b5f4ed92646429601a42e96f0812b31b"

dependencies = [

dependencies = [

 "async-trait",

 "async-trait",

 "lazy_static",

 "lazy_static",
@@ -796,9 +795,9 @@ dependencies = [ 




[[package]]

[[package]]

name = "ctr"

name = "ctr"

version = "0.8.0"

version = "0.9.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"

checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0"

dependencies = [

dependencies = [

 "cipher",

 "cipher",

]

]
@@ -1600,6 +1599,15 @@ dependencies = [ 
 "libc",

 "libc",

]

]





[[package]]

name = "inout"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"

dependencies = [

 "generic-array",

]



[[package]]

[[package]]

name = "instant"

name = "instant"

version = "0.1.12"

version = "0.1.12"
@@ -2313,13 +2321,14 @@ dependencies = [ 




[[package]]

[[package]]

name = "postage"

name = "postage"

version = "0.4.1"

version = "0.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a63d25391d04a097954b76aba742b6b5b74f213dfe3dbaeeb36e8ddc1c657f0b"

checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1"

dependencies = [

dependencies = [

 "atomic",

 "atomic",

 "crossbeam-queue",

 "crossbeam-queue",

 "futures",

 "futures",

 "parking_lot 0.12.0",

 "pin-project",

 "pin-project",

 "static_assertions",

 "static_assertions",

 "thiserror",

 "thiserror",
@@ -2563,9 +2572,9 @@ dependencies = [ 




[[package]]

[[package]]

name = "rlimit"

name = "rlimit"

version = "0.7.0"

version = "0.8.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b"

checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3"

dependencies = [

dependencies = [

 "libc",

 "libc",

]

]
@@ -3506,6 +3515,7 @@ dependencies = [ 
 "base64",

 "base64",

 "cargo-husky",

 "cargo-husky",

 "cipher",

 "cipher",

 "ctr",

 "curve25519-dalek",

 "curve25519-dalek",

 "digest 0.10.3",

 "digest 0.10.3",

 "ed25519-dalek",

 "ed25519-dalek",
@@ -3749,9 +3759,9 @@ dependencies = [ 




[[package]]

[[package]]

name = "tracing-journald"

name = "tracing-journald"

version = "0.2.4"

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 = "1ba49f4829f4e95702943ec6b2fad8936b369d20fa27036caf01329fb230e460"

checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd"

dependencies = [

dependencies = [

 "libc",

 "libc",

 "tracing-core",

 "tracing-core",

crates/arti-client/Cargo.toml

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ derive_more = "0.99" 
directories = "4"

directories = "4"

educe = "0.4.6"

educe = "0.4.6"

futures = "0.3.14"

futures = "0.3.14"

postage = { version = "0.4", default-features = false, features = ["futures-traits"] }

postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }

tracing = "0.1.18"

tracing = "0.1.18"

serde = { version = "1.0.103", features = ["derive"] }

serde = { version = "1.0.103", features = ["derive"] }

thiserror = "1"

thiserror = "1"

crates/arti-config/Cargo.toml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ tor-circmgr = { package = "tor-circmgr", path = "../tor-circmgr", version = "0.2 
tor-config = { package = "tor-config", path = "../tor-config", version = "0.2.0", features = [

tor-config = { package = "tor-config", path = "../tor-config", version = "0.2.0", features = [

    "expand-paths",

    "expand-paths",

] }

] }

config = { version = "0.12.0", default-features = false, features = ["toml"] }

config = { version = "0.13", default-features = false, features = ["toml"] }

once_cell = "1"

once_cell = "1"

serde = { version = "1.0.103", features = ["derive"] }

serde = { version = "1.0.103", features = ["derive"] }

toml = "0.5"

toml = "0.5"

crates/arti-testing/Cargo.toml

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,14 +33,14 @@ arti-config = { path = "../arti-config", version = "0.2.0" } 




anyhow = "1.0.23"

anyhow = "1.0.23"

async-trait = "0.1.2"

async-trait = "0.1.2"

config = { version = "0.12.0", default-features = false }

config = { version = "0.13", default-features = false }

cfg-if = "1.0.0"

cfg-if = "1.0.0"

futures = "0.3.14"

futures = "0.3.14"

tracing = "0.1.18"

tracing = "0.1.18"

notify = "4.0"

notify = "4.0"

pin-project = "1"

pin-project = "1"

rand = "0.8"

rand = "0.8"

rlimit = "0.7"

rlimit = "0.8.3"

serde = { version = "1.0.103", features = ["derive"] }

serde = { version = "1.0.103", features = ["derive"] }

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

tokio = { version = "1.7", features = ["signal", "macros"] }

tokio = { version = "1.7", features = ["signal", "macros"] }

crates/arti/Cargo.toml

+3 −3
Original line number Original line Diff line number Diff line
@@ -32,19 +32,19 @@ arti-config = { path = "../arti-config", version = "0.2.0" } 




anyhow = "1.0.23"

anyhow = "1.0.23"

async-ctrlc = { version = "1.2.0", optional = true }

async-ctrlc = { version = "1.2.0", optional = true }

config = { version = "0.12.0", default-features = false }

config = { version = "0.13", default-features = false }

cfg-if = "1.0.0"

cfg-if = "1.0.0"

derive_builder = "0.11"

derive_builder = "0.11"

futures = "0.3.14"

futures = "0.3.14"

tracing = "0.1.18"

tracing = "0.1.18"

notify = "4.0"

notify = "4.0"

once_cell = { version = "1", optional = true }

once_cell = { version = "1", optional = true }

rlimit = "0.7"

rlimit = "0.8.3"

serde = { version = "1.0.103", features = ["derive"] }

serde = { version = "1.0.103", features = ["derive"] }

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

tokio-crate = { package = "tokio", version = "1.7", optional = true, features = ["signal"] }

tokio-crate = { package = "tokio", version = "1.7", optional = true, features = ["signal"] }

clap = "2.33.0"

clap = "2.33.0"

tracing-journald = { version = "0.2.0", optional = true }

tracing-journald = { version = "0.3.0", optional = true }

tracing-appender = "0.2.0"

tracing-appender = "0.2.0"

trust-dns-proto = "0.21.1"

trust-dns-proto = "0.21.1"