Skip to content

Commit

Permalink
Use git source for derive_builder for now, for sub_builder feature
Browse files Browse the repository at this point in the history
This commitid is the current head of my MR branch
  colin-kiegel/rust-derive-builder#253
  https://github.com/ijackson/rust-derive-builder/tree/field-builder
Using the commitid prevents surprises if that branch is updated.

We will require this newer version of derive_builder.  The version
will need to be bumped again later, assuming the upstream MR is merged
and upstream do a release containing the needed changes.

We will need the new version of not only `derive_builder_core` (the
main macro implementation) but also`derive_builder` for a new error
type.
  • Loading branch information
ijackson committed Apr 21, 2022
1 parent 225accd commit 6da7a2e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
39 changes: 18 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ codegen-units = 1
# 1.56. It saves about 11% download size over the default value of '3'.]
opt-level = 's'

#[patch.crates-io.derive_builder_core]
#git = "https://github.com/ijackson/rust-derive-builder"
#rev = "dccbbb8ad75717c8bc0070b6f0364b2c3a54abb7"
[patch.crates-io.derive_builder]
git = "https://github.com/ijackson/rust-derive-builder"
rev = "4516209ce98f6506bf729aa7cdbced97747f7dd1"

[patch.crates-io.derive_builder_core]
git = "https://github.com/ijackson/rust-derive-builder"
rev = "4516209ce98f6506bf729aa7cdbced97747f7dd1"
2 changes: 1 addition & 1 deletion crates/arti-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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 = "0.11"
derive_builder = "0.11.2"
derive_more = "0.99"
directories = "4"
educe = "0.4.6"
Expand Down
2 changes: 1 addition & 1 deletion crates/arti-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde = { version = "1.0.103", features = ["derive"] }
toml = "0.5"
regex = { version = "1", default-features = false, features = ["std"] }
thiserror = "1"
derive_builder = "0.11"
derive_builder = "0.11.2"

[dev-dependencies]
tempfile = "3"
2 changes: 1 addition & 1 deletion crates/tor-circmgr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.2.0"}

async-trait = "0.1.2"
bounded-vec-deque = "0.1"
derive_builder = "0.11"
derive_builder = "0.11.2"
downcast-rs = "1.2.0"
dyn-clone = "1.0.4"
educe = "0.4.6"
Expand Down
2 changes: 1 addition & 1 deletion crates/tor-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ expand-paths = ["shellexpand", "directories"]
tor-error = { path="../tor-error", version = "0.2.0"}

thiserror = "1"
derive_builder = "0.11"
derive_builder = "0.11.2"
once_cell = "1"
serde = { version = "1.0.103", features = ["derive"] }
shellexpand = { version = "2.1", package = "shellexpand-fork", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/tor-dirmgr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.2.0"}

async-trait = "0.1.2"
base64 = "0.13.0"
derive_builder = "0.11"
derive_builder = "0.11.2"
derive_more = "0.99"
digest = "0.10.0"
educe = "0.4.6"
Expand Down
2 changes: 1 addition & 1 deletion crates/tor-netdir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tor-protover = { path="../tor-protover", version = "0.2.0"}
tor-units = { path="../tor-units", version = "0.2.0"}

bitflags = "1"
derive_builder = "0.11"
derive_builder = "0.11.2"
derive_more = "0.99"
hex = { version = "0.4", optional = true }
hex-literal = { version = "0.3", optional = true }
Expand Down
1 change: 0 additions & 1 deletion maint/downgrade_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

cargo +nightly update -Z minimal-versions
cargo update \
-p darling:0.12.0 \
-p crc32fast \
-p quote:0.6.3 \
-p zeroize_derive:1.1.1 \
Expand Down

0 comments on commit 6da7a2e

Please sign in to comment.