Skip to content

Commit 3d0dacc

Browse files
committed
Auto merge of #703 - memoryruins:conditional, r=jackh726
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).
2 parents e28b6d1 + 3b20ee5 commit 3d0dacc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

chalk-recursive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ tracing = "0.1"
1515

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

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

2323
[features]
2424
default = ["tracing-full"]
2525

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

0 commit comments

Comments
 (0)