Merge #370

370: Use the new Cargo resolver r=jonas-schievink a=jonas-schievink Should avoid the CI failure in #369 (comment) bors r+ Co-authored-by: Jonas Schievink <[email protected]>
nrf-rs · Jan 3, 2022 · bbb0bc4 · bbb0bc4
2 parents 52f6e0f + 3101996
commit bbb0bc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Cargo.ci.toml b/Cargo.ci.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "xtask",
   "nrf52810-hal",

diff --git a/Cargo.example.toml b/Cargo.example.toml
@@ -1,18 +1,19 @@
 # This file is a template for a Cargo workspace for developer convenience.
 #
-# Since Cargo resolves all features for all crates in the workspace together, 
+# Since Cargo resolves all features for all crates in the workspace together,
 # it is not possible to have a workspace with all the crates together, since they
 # enable incompatible features.
 #
 # Instead, we provide this template so you can enable only the crates you're going to
-# work on. This makes eg rust-analyzer check-on-save and autocomplete work, but only 
+# work on. This makes eg rust-analyzer check-on-save and autocomplete work, but only
 # in these crates, without any feature conflict.
 #
 # Copy this file to `Cargo.toml` and uncomment one group of crates below.
 #
 # `/Cargo.toml` is already in .gitignore, so you don't commit it accidentally.
 
 [workspace]
+resolver = "2"
 members = [
 #  Uncomment ONLY ONE of the hals below, depending on your target
 #  "nrf52810-hal",