Skip to content

Commit b3632f7

Browse files
roypatwearyzen
authored andcommitted
fix: specify resolver in Cargo.toml
With one of the recent rust toolchain upgrades, we started getting a warning about different defaults for the results (workspaces default to resolver = "1", yet individual crates default to resolver = "2" since edition 2021). To fix this warning, explicitly set the resolver to version 2 in our top level Cargo.toml The change in resolvers is related to how features are merged. Instead of unifying them (meaning that features enabled in dependencies "leak" into other crates), they are now kept disjoint. This is why the regex dev-dependency now needs the `unicode-perl` feature explicitly enabled. [1]: https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
1 parent 4c65c30 commit b3632f7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[workspace]
22
members = ["src/cpu-template-helper", "src/firecracker", "src/jailer", "src/rebase-snap", "src/seccompiler"]
33
default-members = ["src/firecracker"]
4+
resolver = "2"
45

56
[profile.dev]
67
panic = "abort"

src/firecracker/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ vmm = { path = "../vmm" }
2929

3030
[dev-dependencies]
3131
cargo_toml = "0.15.3"
32-
regex = { version = "1.9.1", default-features = false, features = ["std"] }
32+
regex = { version = "1.9.1", default-features = false, features = ["std", "unicode-perl"] }
3333

3434
# Dev-Dependencies for uffd examples
3535
serde = { version = "1.0.175", features = ["derive"] }

0 commit comments

Comments
 (0)