Skip to content

Commit

Permalink
Auto merge of #703 - memoryruins:conditional, r=jackh726
Browse files Browse the repository at this point in the history
fix(chalk-recursive): allow chalk-solve's default-features to be disabled

Without this change, one of the issues mentioned in #686 continue to persist after #687 because `chalk-solve`'s features were enabled unconditionally when depending on `chalk-recursive`.

Now `chalk-solve`'s `tracing-full` feature is enabled when `chalk-recursive`'s `tracing-full` feature is enabled (which it continues to be by default; it may be worth considering disabling these by default in the future, as #686 suggested, to minimize this sort of issue).
  • Loading branch information
bors committed May 10, 2021
2 parents e28b6d1 + 3b20ee5 commit 3d0dacc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions chalk-recursive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ tracing = "0.1"

chalk-derive = { version = "0.66.0-dev.0", path = "../chalk-derive" }
chalk-ir = { version = "0.66.0-dev.0", path = "../chalk-ir" }
chalk-solve = { version = "0.66.0-dev.0", path = "../chalk-solve" }
chalk-solve = { version = "0.66.0-dev.0", path = "../chalk-solve", default-features = false }

[dev-dependencies]
chalk-integration = { path = "../chalk-integration" }

[features]
default = ["tracing-full"]

tracing-full = ["chalk-solve/tracing-subscriber", "chalk-solve/tracing-tree"]
tracing-full = ["chalk-solve/tracing-full"]

0 comments on commit 3d0dacc

Please sign in to comment.