Commit 03028948 authored by Ian Jackson's avatar Ian Jackson
Browse files

Switch to derive_builder_arti_fork 

For reference, the git source for this crate (and the others in its
workspace) currently lives in my personal github account (ijackson).
If this fork turns out to be long-lived and gains features and/or
users, it would be good to move it to a gitlab somewhere.

I have granted Nick crate ownership on the crates.io system.
parent de2b2364

Cargo.lock

+27 −24
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ dependencies = [ 
 "cfg-if 1.0.0",

 "clap",

 "config",

 "derive_builder",

 "derive_builder_fork_arti",

 "futures",

 "libc",

 "notify",
@@ -126,7 +126,7 @@ name = "arti-client" 
version = "0.2.0"

dependencies = [

 "anyhow",

 "derive_builder",

 "derive_builder_fork_arti",

 "derive_more",

 "directories",

 "educe",
@@ -161,7 +161,7 @@ version = "0.2.0" 
dependencies = [

 "arti-client",

 "config",

 "derive_builder",

 "derive_builder_fork_arti",

 "once_cell",

 "regex",

 "serde",
@@ -877,30 +877,33 @@ dependencies = [ 
]



[[package]]

name = "derive_builder"

name = "derive_builder_core_fork_arti"

version = "0.11.2"

source = "git+https://github.com/ijackson/rust-derive-builder?rev=ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe#ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe"

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

checksum = "24c1b715c79be6328caa9a5e1a387a196ea503740f0722ec3dd8f67a9e72314d"

dependencies = [

 "derive_builder_macro",

 "darling",

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "derive_builder_core"

name = "derive_builder_fork_arti"

version = "0.11.2"

source = "git+https://github.com/ijackson/rust-derive-builder?rev=4516209ce98f6506bf729aa7cdbced97747f7dd1#4516209ce98f6506bf729aa7cdbced97747f7dd1"

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

checksum = "c3eae24d595f4d0ecc90a9a5a6d11c2bd8dafe2375ec4a1ec63250e5ade7d228"

dependencies = [

 "darling",

 "proc-macro2",

 "quote",

 "syn",

 "derive_builder_macro_fork_arti",

]



[[package]]

name = "derive_builder_macro"

name = "derive_builder_macro_fork_arti"

version = "0.11.2"

source = "git+https://github.com/ijackson/rust-derive-builder?rev=a69d5eee830bddd5ff9b146b51e27580b1a7b6b0#a69d5eee830bddd5ff9b146b51e27580b1a7b6b0"

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

checksum = "69887769a2489cd946bf782eb2b1bb2cb7bc88551440c94a765d4f040c08ebf3"

dependencies = [

 "derive_builder_core",

 "derive_builder_core_fork_arti",

 "syn",

]
@@ -2038,9 +2041,9 @@ dependencies = [ 


[[package]]

name = "num_threads"

version = "0.1.5"

version = "0.1.6"

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

checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"

checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"

dependencies = [

 "libc",

]
@@ -2361,9 +2364,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" 


[[package]]

name = "proc-macro2"

version = "1.0.37"

version = "1.0.38"

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

checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"

checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"

dependencies = [

 "unicode-xid",

]
@@ -3296,7 +3299,7 @@ version = "0.2.0" 
dependencies = [

 "async-trait",

 "bounded-vec-deque",

 "derive_builder",

 "derive_builder_fork_arti",

 "downcast-rs",

 "dyn-clone",

 "educe",
@@ -3333,7 +3336,7 @@ name = "tor-config" 
version = "0.2.0"

dependencies = [

 "config",

 "derive_builder",

 "derive_builder_fork_arti",

 "directories",

 "dirs",

 "educe",
@@ -3392,7 +3395,7 @@ version = "0.2.0" 
dependencies = [

 "async-trait",

 "base64",

 "derive_builder",

 "derive_builder_fork_arti",

 "derive_more",

 "digest 0.10.3",

 "educe",
@@ -3461,7 +3464,7 @@ name = "tor-guardmgr" 
version = "0.2.0"

dependencies = [

 "base64",

 "derive_builder",

 "derive_builder_fork_arti",

 "derive_more",

 "educe",

 "float_eq",
@@ -3538,7 +3541,7 @@ name = "tor-netdir" 
version = "0.2.0"

dependencies = [

 "bitflags",

 "derive_builder",

 "derive_builder_fork_arti",

 "derive_more",

 "futures",

 "hex",

crates/arti-client/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ tor-proto = { path = "../tor-proto", version = "0.2.0" } 
tor-rtcompat = { path = "../tor-rtcompat", version = "0.2.0" }



humantime-serde = "1.1.1"

derive_builder = { version = "0.11.2", git = "https://github.com/ijackson/rust-derive-builder", rev = "ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe" }

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

derive_more = "0.99"

directories = "4"

educe = "0.4.6"

crates/arti-config/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ serde = { version = "1.0.103", features = ["derive"] } 
toml = "0.5"

regex = { version = "1", default-features = false, features = ["std"] }

thiserror = "1"

derive_builder = { version = "0.11.2", git = "https://github.com/ijackson/rust-derive-builder", rev = "ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe" }

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



[dev-dependencies]

tempfile = "3"

crates/arti/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ anyhow = "1.0.23" 
async-ctrlc = { version = "1.2.0", optional = true }

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

cfg-if = "1.0.0"

derive_builder = { version = "0.11", git = "https://github.com/ijackson/rust-derive-builder", rev = "ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe" }

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

futures = "0.3.14"

tracing = "0.1.18"

notify = "4.0"

crates/tor-circmgr/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.2.0" } 


async-trait = "0.1.2"

bounded-vec-deque = "0.1"

derive_builder = { version = "0.11.2", git = "https://github.com/ijackson/rust-derive-builder", rev = "ba0c1a5311bd9f93ddf5f5b8ec2a5f6f03b22fbe" }

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

downcast-rs = "1.2.0"

dyn-clone = "1.0.4"

educe = "0.4.6"