Skip to content

Commit

Permalink
Fix issue with features specified for anyhow, clap, and pem.
Browse files Browse the repository at this point in the history
I don't fully understand how cargo resolves dependencies & features but
`cargo build --project` was failing due to missing features in the
crates listed above. These were not explicitly set in their respective
`Cargo.toml` files so this commit resolves that.
  • Loading branch information
flihp committed Nov 29, 2023
1 parent 8bcf27b commit 2236b81
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 22 deletions.
82 changes: 70 additions & 12 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ resolver = "2"
[workspace.dependencies]
anyhow = { version = "1", default-features = false }
chrono = { version = "0.4.31", default-features=false }
clap = { version = "4", default-features = false }
clap = { version = "4.4", features = ["derive", "env"] }
corncobs = "0.1"
derive_more = "0.99"
ecdsa = { version = "0.16", default-features = false }
env_logger = { version = "0.10", default-features = false }
hex = { version = "0.4", default-features = false }
hex.version = "0.4"
hubpack = "0.1"
log = { version = "0.4", features = ["std"] }
p384 = { version = "0.13", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions dice-cert-check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = { workspace = true, default-features = true }
clap = { workspace = true, default-features = true, features = ["derive"] }
anyhow = { workspace = true, features = ["std"] }
clap.workspace = true
const-oid = { version = "0.9.5", features = ["db"] }
env_logger = { workspace = true, default-features = true }
hex = { workspace = true, default-features = true }
Expand Down
2 changes: 1 addition & 1 deletion dice-cert-tmpl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
license = "MPL-2.0"

[dependencies]
clap = { workspace = true, features = ["derive"] }
clap.workspace = true
dice-mfg-msgs = { path = "../dice-mfg-msgs" }
pem = { workspace = true, default-features = true }
salty.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions dice-mfg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ license = "MPL-2.0"
[dependencies]
anyhow = { workspace = true, features = ["std"] }
chrono = { workspace = true, features = ["clock", "std"] }
clap = { workspace = true, features = ["derive", "env"] }
clap.workspace = true
const-oid = { version = "0.9.5", features = ["std", "db"] }
corncobs.workspace = true
dice-mfg-msgs = { path = "../dice-mfg-msgs", features = ["std"] }
env_logger.workspace = true
log.workspace = true
pem.workspace = true
pem = { workspace = true, features = ["std"] }
rpassword.workspace = true
serde_json.workspace = true
serialport.workspace = true
Expand Down
4 changes: 1 addition & 3 deletions yhsm-audit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ name = "yubihsm-audit"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow.workspace = true
anyhow = { workspace = true, features = ["std"] }
clap.workspace = true
derive_more.workspace = true
env_logger.workspace = true
Expand Down

0 comments on commit 2236b81

Please sign in to comment.