Commit aa5e647b authored by Ian Jackson's avatar Ian Jackson 💬
Browse files

Merge branch 'chore/integrate_cargo_sort' into 'main' 

Lexically sort Cargo.toml dependencies

Closes #490

See merge request !549
parents 573d1236 bfd41ddb

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -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

+26 −26
Original line number Diff line number Diff line
@@ -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

+8 −8
Original line number Diff line number Diff line
@@ -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

+16 −17
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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"] }