Merge branch 'upgrade-dependencies' into 'main' (6755648f) · Commits · The Tor Project / Core / Arti

Cargo.lock

+23 −28

Original line number	Diff line number	Diff line
		@@ -62,12 +62,6 @@ version = "0.3.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"

		[[package]]
		name = "arrayvec"
		version = "0.5.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"

		[[package]]
		name = "arti"
		version = "0.0.4"
		@@ -628,12 +622,14 @@ dependencies = [

		[[package]]
		name = "config"
		version = "0.11.0"
		version = "0.12.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
		checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86"
		dependencies = [
		"async-trait",
		"lazy_static",
		"nom",
		"pathdiff",
		"serde",
		"toml",
		]
		@@ -1561,19 +1557,6 @@ version = "1.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

		[[package]]
		name = "lexical-core"
		version = "0.7.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
		dependencies = [
		"arrayvec",
		"bitflags",
		"cfg-if 1.0.0",
		"ryu",
		"static_assertions",
		]

		[[package]]
		name = "libc"
		version = "0.2.115"
		@@ -1678,6 +1661,12 @@ dependencies = [
		"zeroize",
		]

		[[package]]
		name = "minimal-lexical"
		version = "0.2.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

		[[package]]
		name = "miniz_oxide"
		version = "0.4.4"
		@@ -1797,12 +1786,12 @@ dependencies = [

		[[package]]
		name = "nom"
		version = "5.1.2"
		version = "7.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
		checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
		dependencies = [
		"lexical-core",
		"memchr",
		"minimal-lexical",
		"version_check",
		]

		@@ -2007,6 +1996,12 @@ dependencies = [
		"winapi 0.3.9",
		]

		[[package]]
		name = "pathdiff"
		version = "0.2.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"

		[[package]]
		name = "pem-rfc7468"
		version = "0.2.4"
		@@ -2357,9 +2352,9 @@ dependencies = [

		[[package]]
		name = "rlimit"
		version = "0.6.2"
		version = "0.7.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "cc0bf25554376fd362f54332b8410a625c71f15445bca32ffdfdf4ec9ac91726"
		checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b"
		dependencies = [
		"libc",
		]
		@@ -2868,9 +2863,9 @@ dependencies = [

		[[package]]
		name = "tokio-util"
		version = "0.6.9"
		version = "0.7.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
		checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1"
		dependencies = [
		"bytes",
		"futures-core",

crates/arti-bench/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ serde = { version = "1.0.103", features = ["derive"] }
		serde_json = "1.0.50"
		tracing = "0.1.18"
		tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
		tokio = { version = "1.4", features = ["full"] }
		tokio = { version = "1.7", features = ["full"] }
		tor-rtcompat = { path="../tor-rtcompat", version = "0.0.4", features = ["tokio", "native-tls"] }
		arti-config = { path="../arti-config", version = "0.0.4"}
		arti-client = { package="arti-client", path = "../arti-client", version = "0.0.4"}

crates/arti-bench/src/main.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ use rand::distributions::Standard;
		use rand::Rng;
		use serde::{Deserialize, Serialize};
		use std::collections::HashMap;
		use std::convert::TryInto;
		use std::fmt;
		use std::fmt::Formatter;
		use std::future::Future;

crates/arti-client/Cargo.toml

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,9 +47,9 @@ thiserror = "1"

		[dev-dependencies]
		tor-rtcompat = { path="../tor-rtcompat", version = "0.0.4", features=["tokio", "native-tls" ] }
		tokio-crate = { package = "tokio", version = "1.4", features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros" ] }
		tokio-crate = { package = "tokio", version = "1.7", features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros" ] }
		pin-project = "1"
		tokio-util = { version = "0.6", features = ["compat"] }
		tokio-util = { version = "0.7.0", features = ["compat"] }
		anyhow = "1.0.23"
		tracing-subscriber = "0.3.0"
		tempfile = "3.3"

crates/arti-config/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ repository="https://gitlab.torproject.org/tpo/core/arti.git/"
		arti-client = { package="arti-client", path = "../arti-client", version = "0.0.4"}
		tor-circmgr = { package="tor-circmgr", path="../tor-circmgr", version = "0.0.4"}
		tor-config = { package="tor-config", path = "../tor-config", version = "0.0.4", features = ["expand-paths"]}
		config = { version = "0.11.0", default-features = false, features = ["toml"] }
		config = { version = "0.12.0", default-features = false, features = ["toml"] }
		once_cell = "1"
		serde = { version = "1.0.103", features = ["derive"] }
		toml = "0.5"