Lexically sort Cargo.toml dependencies

Utilize cargo-sort: https://github.com/DevinR528/cargo-sort



Signed-off-by: Orhun Parmaksız <orhunparmaksiz@gmail.com>

.gitlab-ci.yml

@@ -42,10 +42,14 @@ rust-latest:
     - cp cargo-audit $CARGO_HOME/bin/ || cargo install cargo-audit
     - ./maint/cargo_audit
     - cp $CARGO_HOME/bin/cargo-audit .
+    - cp cargo-sort $CARGO_HOME/bin/ || cargo install cargo-sort
+    - ./maint/cargo_sort
+    - cp $CARGO_HOME/bin/cargo-sort .
     - cargo build --verbose --release -p arti-bench --target x86_64-unknown-linux-gnu
   cache:
     paths:
       - cargo-audit
+      - cargo-sort
   artifacts:
     paths:
       - target/x86_64-unknown-linux-gnu/debug/arti

Cargo.toml

@@ -6,41 +6,41 @@
 # Please keep this list topologically sorted by dependency relation, so
 # that every crate appears _before_ any other crate that depends on it.
 members = [
-    "crates/tor-basic-utils",
+    "crates/arti",
+    "crates/arti-bench",
+    "crates/arti-client",
+    "crates/arti-config",
+    "crates/arti-hyper",
+    "crates/arti-testing",
     "crates/caret",
     "crates/fs-mistrust",
-    "crates/safelog",
     "crates/retry-error",
-    "crates/tor-error",
-    "crates/tor-config",
-    "crates/tor-events",
-    "crates/tor-units",
-    "crates/tor-rtcompat",
-    "crates/tor-rtmock",
-    "crates/tor-llcrypto",
-    "crates/tor-protover",
+    "crates/safelog",
+    "crates/tor-basic-utils",
     "crates/tor-bytes",
-    "crates/tor-socksproto",
-    "crates/tor-checkable",
-    "crates/tor-cert",
-    "crates/tor-linkspec",
     "crates/tor-cell",
-    "crates/tor-proto",
-    "crates/tor-netdoc",
-    "crates/tor-consdiff",
-    "crates/tor-netdir",
-    "crates/tor-persist",
+    "crates/tor-cert",
     "crates/tor-chanmgr",
-    "crates/tor-guardmgr",
+    "crates/tor-checkable",
     "crates/tor-circmgr",
+    "crates/tor-config",
+    "crates/tor-consdiff",
     "crates/tor-dirclient",
     "crates/tor-dirmgr",
-    "crates/arti-client",
-    "crates/arti-config",
-    "crates/arti-hyper",
-    "crates/arti",
-    "crates/arti-bench",
-    "crates/arti-testing",
+    "crates/tor-error",
+    "crates/tor-events",
+    "crates/tor-guardmgr",
+    "crates/tor-linkspec",
+    "crates/tor-llcrypto",
+    "crates/tor-netdir",
+    "crates/tor-netdoc",
+    "crates/tor-persist",
+    "crates/tor-proto",
+    "crates/tor-protover",
+    "crates/tor-rtcompat",
+    "crates/tor-rtmock",
+    "crates/tor-socksproto",
+    "crates/tor-units",
 ]
 
 resolver = "2"

crates/arti-bench/Cargo.toml

@@ -12,19 +12,19 @@ categories = ["asynchronous"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [dependencies]
+anyhow = "1.0.23"
+arti = { path = "../arti", version = "0.4.0" }
+arti-client = { package = "arti-client", path = "../arti-client", version = "0.4.0" }
 clap = "2.33.0"
-futures = "0.3.14"
 float-ord = "0.3"
+fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
+futures = "0.3.14"
 rand = "0.8"
-anyhow = "1.0.23"
 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.7", features = ["full"] }
+tokio-socks = "0.5"
 tor-config = { path = "../tor-config", version = "0.4.0" }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
-arti = { path = "../arti", version = "0.4.0" }
-arti-client = { package = "arti-client", path = "../arti-client", version = "0.4.0" }
-fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
-tokio-socks = "0.5"
+tracing = "0.1.18"
+tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-client/Cargo.toml

@@ -31,12 +31,22 @@ error_detail = []
 experimental-api = []
 
 [dependencies]
+derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
+derive_more = "0.99"
+directories = "4"
+educe = "0.4.6"
 fs-mistrust = { path = "../fs-mistrust", version = "0.2.0", features = ["serde"] }
+futures = "0.3.14"
+humantime-serde = "1.1.1"
+pin-project = "1"
+postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
 safelog = { path = "../safelog", version = "0.1.0" }
+serde = { version = "1.0.103", features = ["derive"] }
+thiserror = "1"
 tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-chanmgr = { path = "../tor-chanmgr", version = "0.3.1" }
 tor-circmgr = { path = "../tor-circmgr", version = "0.3.1" }
 tor-config = { path = "../tor-config", version = "0.4.0" }
-tor-chanmgr = { path = "../tor-chanmgr", version = "0.3.1" }
 tor-dirmgr = { path = "../tor-dirmgr", version = "0.4.0" }
 tor-error = { path = "../tor-error", version = "0.3.1" }
 tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1" }
@@ -44,21 +54,13 @@ tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
 tor-persist = { path = "../tor-persist", version = "0.4.0" }
 tor-proto = { path = "../tor-proto", version = "0.3.1" }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-
-humantime-serde = "1.1.1"
-derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
-derive_more = "0.99"
-directories = "4"
-educe = "0.4.6"
-futures = "0.3.14"
-postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
 tracing = "0.1.18"
-serde = { version = "1.0.103", features = ["derive"] }
-thiserror = "1"
-pin-project = "1"
 
 [dev-dependencies]
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
+anyhow = "1.0.23"
+once_cell = "1.9"
+pin-project = "1"
+tempfile = "3.3"
 tokio-crate = { package = "tokio", version = "1.7", features = [
     "rt",
     "rt-multi-thread",
@@ -67,9 +69,6 @@ tokio-crate = { package = "tokio", version = "1.7", features = [
     "time",
     "macros",
 ] }
-pin-project = "1"
 tokio-util = { version = "0.7.0", features = ["compat"] }
-anyhow = "1.0.23"
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
 tracing-subscriber = "0.3.0"
-tempfile = "3.3"
-once_cell = "1.9"

crates/arti-hyper/Cargo.toml

@@ -29,6 +29,9 @@ arti-client = { path = "../arti-client", version = "0.4.0" }
 educe = "0.4.6"
 hyper = { version = "0.14", features = ["http1", "client", "runtime"] }
 pin-project = "1"
+thiserror = "1"
+tls-api = { version = "0.8" }
+tls-api-native-tls = { version = "0.8.0" }
 tokio = { package = "tokio", version = "1.7", features = [
     "rt",
     "rt-multi-thread",
@@ -37,9 +40,6 @@ tokio = { package = "tokio", version = "1.7", features = [
     "time",
     "macros",
 ] }
-thiserror = "1"
-tls-api = { version = "0.8" }
-tls-api-native-tls = { version = "0.8.0" }
 tor-error = { path = "../tor-error", version = "0.3.1" }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio"] }
 

crates/arti-testing/Cargo.toml

@@ -15,34 +15,33 @@ publish = false
 [features]
 
 [dependencies]
+anyhow = "1.0.23"
 arti = { package = "arti", path = "../arti", version = "0.4.0" }
 arti-client = { package = "arti-client", path = "../arti-client", version = "0.4.0", features = [
     "dirfilter",
 ] }
-tor-dirmgr = { package = "tor-dirmgr", path = "../tor-dirmgr", version = "0.4.0", features = [
-    "dirfilter",
-] }
-tor-netdoc = { package = "tor-netdoc", path = "../tor-netdoc", version = "0.4.0", features = [
-    "experimental-api",
-    "dangerous-expose-struct-fields",
-] }
-tor-checkable = { path = "../tor-checkable", version = "0.3.0", features = ["experimental-api"] }
-tor-config = { path = "../tor-config", version = "0.4.0" }
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-tor-error = { path = "../tor-error", version = "0.3.1" }
-
-anyhow = "1.0.23"
 async-trait = "0.1.2"
-config = { version = "0.13", default-features = false }
 cfg-if = "1.0.0"
+clap = "2.33.0"
+config = { version = "0.13", default-features = false }
 futures = "0.3.14"
-tracing = "0.1.18"
 notify = "4.0"
 pin-project = "1"
 rand = "0.8"
 rlimit = "0.8.3"
 serde = { version = "1.0.103", features = ["derive"] }
-tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 tokio = { version = "1.7", features = ["signal", "macros"] }
-clap = "2.33.0"
+tor-checkable = { path = "../tor-checkable", version = "0.3.0", features = ["experimental-api"] }
+tor-config = { path = "../tor-config", version = "0.4.0" }
+tor-dirmgr = { package = "tor-dirmgr", path = "../tor-dirmgr", version = "0.4.0", features = [
+    "dirfilter",
+] }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-netdoc = { package = "tor-netdoc", path = "../tor-netdoc", version = "0.4.0", features = [
+    "experimental-api",
+    "dangerous-expose-struct-fields",
+] }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
+tracing = "0.1.18"
 tracing-appender = "0.2.0"
+tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti/Cargo.toml

@@ -23,30 +23,29 @@ static-native-tls = ["arti-client/static-native-tls", "native-tls"]
 journald = ["tracing-journald"]
 
 [dependencies]
-safelog = { path = "../safelog", version = "0.1.0" }
-fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
-arti-client = { package = "arti-client", path = "../arti-client", version = "0.4.0", default-features = false }
-tor-config = { path = "../tor-config", version = "0.4.0" }
-tor-error = { path = "../tor-error", version = "0.3.1", default-features = false }
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", default-features = false }
-tor-socksproto = { path = "../tor-socksproto", version = "0.3.0"}
-
 anyhow = "1.0.23"
+arti-client = { package = "arti-client", path = "../arti-client", version = "0.4.0", default-features = false }
 async-ctrlc = { version = "1.2.0", optional = true }
-config = { version = "0.13", default-features = false, features = ["toml"] }
 cfg-if = "1.0.0"
+clap = "2.33.0"
+config = { version = "0.13", default-features = false, features = ["toml"] }
 derive_builder = { version = "0.11", package = "derive_builder_fork_arti" }
+fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
 futures = "0.3.14"
-tracing = "0.1.18"
 notify = "4.0"
 once_cell = { version = "1", optional = true }
 rlimit = "0.8.3"
+safelog = { path = "../safelog", version = "0.1.0" }
 serde = { version = "1.0.103", features = ["derive"] }
-tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 tokio-crate = { package = "tokio", version = "1.7", optional = true, features = ["signal"] }
-clap = "2.33.0"
-tracing-journald = { version = "0.3.0", optional = true }
+tor-config = { path = "../tor-config", version = "0.4.0" }
+tor-error = { path = "../tor-error", version = "0.3.1", default-features = false }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", default-features = false }
+tor-socksproto = { path = "../tor-socksproto", version = "0.3.0" }
+tracing = "0.1.18"
 tracing-appender = "0.2.0"
+tracing-journald = { version = "0.3.0", optional = true }
+tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 trust-dns-proto = "0.21.1"
 
 [dev-dependencies]

crates/fs-mistrust/Cargo.toml

@@ -16,9 +16,9 @@ default = ["walkdir"]
 [dependencies]
 derive_builder = { version = "0.11", package = "derive_builder_fork_arti" }
 educe = "0.4.6"
+serde = { version = "1.0.103", features = ["derive"], optional = true }
 thiserror = "1"
 walkdir = { version = "2", optional = true }
-serde = { version = "1.0.103", features = ["derive"], optional = true }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

crates/safelog/Cargo.toml

@@ -17,9 +17,9 @@ default = []
 
 [dependencies]
 educe = "0.4.6"
-thiserror = "1"
 fluid-let = "1"
 serde = { version = "1.0.103", optional = true, features = ["derive"] }
+thiserror = "1"
 
 [dev-dependencies]
 serial_test = "0.6"

crates/tor-basic-utils/Cargo.toml

@@ -14,8 +14,8 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [dependencies]
 futures = "0.3.14"
-rand = "0.8"
 pin-project = "1"
+rand = "0.8"
 
 [dev-dependencies]
 derive_more = "0.99"

crates/tor-bytes/Cargo.toml

@@ -12,15 +12,14 @@ categories = ["parsing", "encoding"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [dependencies]
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-tor-error = { path = "../tor-error", version = "0.3.1" }
-
 arrayref = "0.3"
 bytes = "1"
 digest = { version = "0.10.0", features = ["subtle", "mac"] }
 generic-array = "0.14.3"
 signature = "1"
 thiserror = "1"
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
 
 [dev-dependencies]
 hex-literal = "0.3"

crates/tor-cell/Cargo.toml

@@ -12,21 +12,20 @@ categories = ["parser-implementations", "network-programming"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [dependencies]
-caret = { path = "../caret", version = "0.2.0"}
-educe = "0.4.6"
-tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-tor-bytes = { path = "../tor-bytes", version = "0.3.0"}
-tor-cert = { path = "../tor-cert", version = "0.3.0"}
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-linkspec = { path = "../tor-linkspec", version = "0.3.0"}
-
 arrayref = "0.3"
 bitflags = "1"
 bytes = "1"
+caret = { path = "../caret", version = "0.2.0" }
+educe = "0.4.6"
 rand = "0.8"
 thiserror = "1"
+tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-bytes = { path = "../tor-bytes", version = "0.3.0" }
+tor-cert = { path = "../tor-cert", version = "0.3.0" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-linkspec = { path = "../tor-linkspec", version = "0.3.0" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
 
 [dev-dependencies]
-hex-literal = "0.3"
 hex = "0.4"
+hex-literal = "0.3"

crates/tor-cert/Cargo.toml

@@ -12,13 +12,12 @@ categories = ["parser-implementations"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [dependencies]
-caret = { path = "../caret", version = "0.2.0"}
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-tor-bytes = { path = "../tor-bytes", version = "0.3.0"}
-tor-checkable = { path = "../tor-checkable", version = "0.3.0"}
-
+caret = { path = "../caret", version = "0.2.0" }
 digest = "0.10.0"
 signature = "1"
+tor-bytes = { path = "../tor-bytes", version = "0.3.0" }
+tor-checkable = { path = "../tor-checkable", version = "0.3.0" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
 
 [dev-dependencies]
 base64 = "0.13.0"

crates/tor-chanmgr/Cargo.toml

@@ -14,25 +14,24 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 [features]
 
 [dependencies]
-tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-tor-proto = { path = "../tor-proto", version = "0.3.1" }
-tor-linkspec = { path = "../tor-linkspec", version = "0.3.0"}
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-
 async-trait = "0.1.2"
 derive_more = "0.99"
 educe = "0.4.6"
 futures = "0.3.14"
 postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
 rand = "0.8"
-tracing = "0.1.18"
 thiserror = "1"
+tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-linkspec = { path = "../tor-linkspec", version = "0.3.0" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
+tor-proto = { path = "../tor-proto", version = "0.3.1" }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
+tracing = "0.1.18"
 
 [dev-dependencies]
 float_eq = "0.7"
 futures-await-test = "0.3.0"
 hex-literal = "0.3"
-tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
+tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }

crates/tor-checkable/Cargo.toml

@@ -15,7 +15,6 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 experimental-api = []
 
 [dependencies]
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-
 signature = "1"
 thiserror = "1"
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }

crates/tor-circmgr/Cargo.toml

@@ -19,20 +19,6 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 experimental-api = []
 
 [dependencies]
-safelog = { path = "../safelog", version = "0.1.0" }
-tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
-tor-chanmgr = { path = "../tor-chanmgr", version = "0.3.1" }
-tor-config = { path = "../tor-config", version = "0.4.0" }
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1" }
-tor-netdir = { path = "../tor-netdir", version = "0.3.0"}
-tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
-tor-proto = { path = "../tor-proto", version = "0.3.1" }
-retry-error = { path = "../retry-error", version = "0.2.0"}
-tor-linkspec = { path = "../tor-linkspec", version = "0.3.0"}
-tor-persist = { path = "../tor-persist", version = "0.4.0" }
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-
 async-trait = "0.1.2"
 bounded-vec-deque = "0.1"
 derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
@@ -43,19 +29,32 @@ futures = "0.3.14"
 humantime-serde = "1.1.1"
 itertools = "0.10.1"
 once_cell = "1"
-tracing = "0.1.18"
 pin-project = "1"
 rand = "0.8"
+retry-error = { path = "../retry-error", version = "0.2.0" }
+safelog = { path = "../safelog", version = "0.1.0" }
 serde = { version = "1.0.103", features = ["derive"] }
 static_assertions = "1"
 thiserror = "1"
+tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-chanmgr = { path = "../tor-chanmgr", version = "0.3.1" }
+tor-config = { path = "../tor-config", version = "0.4.0" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1" }
+tor-linkspec = { path = "../tor-linkspec", version = "0.3.0" }
+tor-netdir = { path = "../tor-netdir", version = "0.3.0" }
+tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
+tor-persist = { path = "../tor-persist", version = "0.4.0" }
+tor-proto = { path = "../tor-proto", version = "0.3.1" }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
+tracing = "0.1.18"
 weak-table = "0.3.0"
 
 [dev-dependencies]
 futures-await-test = "0.3.0"
-tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }
 tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1", features = ["testing"] }
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
 tor-netdir = { path = "../tor-netdir", version = "0.3.0", features = ["testing"] }
 tor-persist = { path = "../tor-persist", version = "0.4.0", features = ["testing"] }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
+tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }

crates/tor-config/Cargo.toml

@@ -16,12 +16,9 @@ default = ["expand-paths"]
 expand-paths = ["shellexpand", "directories"]
 
 [dependencies]
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-basic-utils = { path="../tor-basic-utils", version = "0.3.1" }
-
-thiserror = "1"
 config = { version = "0.13", default-features = false, features = ["toml"] }
 derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
+directories = { version = "4", optional = true }
 educe = "0.4.6"
 fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
 itertools = "0.10.1"
@@ -31,9 +28,11 @@ regex = { version = "1", default-features = false, features = ["std"] }
 serde = { version = "1.0.103", features = ["derive"] }
 serde_ignored = "0.1.3"
 shellexpand = { version = "2.1", package = "shellexpand-fork", optional = true }
+thiserror = "1"
 toml = "0.5"
+tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
 tracing = "0.1.18"
-directories = { version = "4", optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.23"

crates/tor-consdiff/Cargo.toml

@@ -7,18 +7,16 @@ rust-version = "1.56"
 license = "MIT OR Apache-2.0"
 homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home"
 description = "Handle the consensus-diff format used in the Tor directory protocol"
-keywords = [ "tor", "arti", "diff" ]
-categories = [ "parser-implementations", "network-programming" ]
-repository="https://gitlab.torproject.org/tpo/core/arti.git/"
+keywords = ["tor", "arti", "diff"]
+categories = ["parser-implementations", "network-programming"]
+repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
 [features]
 default = []
 slow-diff-apply = []
 
 [dependencies]
-
-tor-llcrypto = { path="../tor-llcrypto", version = "0.3.0"}
-
 digest = "0.10.0"
 hex = "0.4"
 thiserror = "1"
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }

crates/tor-dirclient/Cargo.toml

@@ -19,27 +19,26 @@ zstd = ["async-compression/zstd"]
 routerdesc = []
 
 [dependencies]
-tor-circmgr = { path = "../tor-circmgr", version = "0.3.1" }
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-linkspec = { path = "../tor-linkspec", version = "0.3.0"}
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-tor-proto = { path = "../tor-proto", version = "0.3.1" }
-tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-
 async-compression = { version = "0.3.14", features = ["futures-io", "zlib"] }
 base64 = "0.13.0"
 derive_more = "0.99"
 futures = "0.3.14"
 hex = "0.4"
 http = "0.2"
-httpdate = "1.0"
 httparse = "1.2"
-tracing = "0.1.18"
+httpdate = "1.0"
 memchr = "2"
 thiserror = "1"
+tor-circmgr = { path = "../tor-circmgr", version = "0.3.1" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-linkspec = { path = "../tor-linkspec", version = "0.3.0" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
+tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
+tor-proto = { path = "../tor-proto", version = "0.3.1" }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
+tracing = "0.1.18"
 
 [dev-dependencies]
 futures-await-test = "0.3.0"
-tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
+tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }

crates/tor-dirmgr/Cargo.toml

@@ -26,21 +26,6 @@ dirfilter = []
 experimental-api = []
 
 [dependencies]
-fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
-tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
-retry-error = { path = "../retry-error", version = "0.2.0"}
-tor-checkable = { path = "../tor-checkable", version = "0.3.0"}
-tor-circmgr = { path = "../tor-circmgr", version = "0.3.1" }
-tor-config = { path = "../tor-config", version = "0.4.0" }
-tor-consdiff = { path = "../tor-consdiff", version = "0.3.0"}
-tor-dirclient = { path = "../tor-dirclient", version = "0.3.1" }
-tor-error = { path = "../tor-error", version = "0.3.1" }
-tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1" }
-tor-netdir = { path = "../tor-netdir", version = "0.3.0"}
-tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
-tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0"}
-tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
-
 async-trait = "0.1.2"
 base64 = "0.13.0"
 derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
@@ -48,26 +33,40 @@ derive_more = "0.99"
 digest = "0.10.0"
 educe = "0.4.6"
 event-listener = "2"
-futures = "0.3.14"
+fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
 fslock = { version = "0.2.0" }
+futures = "0.3.14"
 hex = "0.4"
+humantime-serde = "1.1.1"
 itertools = "0.10.1"
-tracing = "0.1.18"
 memmap2 = { version = "0.5.0", optional = true }
 once_cell = "1"
 postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
 rand = "0.8"
+retry-error = { path = "../retry-error", version = "0.2.0" }
 rusqlite = { version = "0.27.0", features = ["time"] }
 serde = { version = "1.0.103", features = ["derive"] }
 signature = "1"
 thiserror = "1"
 time = { version = "0.3", features = ["formatting", "parsing"] }
-humantime-serde = "1.1.1"
+tor-basic-utils = { path = "../tor-basic-utils", version = "0.3.1" }
+tor-checkable = { path = "../tor-checkable", version = "0.3.0" }
+tor-circmgr = { path = "../tor-circmgr", version = "0.3.1" }
+tor-config = { path = "../tor-config", version = "0.4.0" }
+tor-consdiff = { path = "../tor-consdiff", version = "0.3.0" }
+tor-dirclient = { path = "../tor-dirclient", version = "0.3.1" }
+tor-error = { path = "../tor-error", version = "0.3.1" }
+tor-guardmgr = { path = "../tor-guardmgr", version = "0.3.1" }
+tor-llcrypto = { path = "../tor-llcrypto", version = "0.3.0" }
+tor-netdir = { path = "../tor-netdir", version = "0.3.0" }
+tor-netdoc = { path = "../tor-netdoc", version = "0.4.0" }
+tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0" }
+tracing = "0.1.18"
 
 [dev-dependencies]
+float_eq = "0.7"
 futures-await-test = "0.3.0"
 hex-literal = "0.3"
 tempfile = "3"
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.4.0", features = ["tokio", "native-tls"] }
 tor-rtmock = { path = "../tor-rtmock", version = "0.4.0" }
-float_eq = "0.7"