Use the new Cargo resolver

Jonas Schievink · Jonas Schievink · commit 31019961a1e9 · 2022-01-03T13:35:36.000+01:00
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",

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,19 @@`
`1`	`1`	`# This file is a template for a Cargo workspace for developer convenience.`
`2`	`2`	`#`
`3`		`-# Since Cargo resolves all features for all crates in the workspace together,`
	`3`	`+# Since Cargo resolves all features for all crates in the workspace together,`
`4`	`4`	`# it is not possible to have a workspace with all the crates together, since they`
`5`	`5`	`# enable incompatible features.`
`6`	`6`	`#`
`7`	`7`	`# Instead, we provide this template so you can enable only the crates you're going to`
`8`		`-# work on. This makes eg rust-analyzer check-on-save and autocomplete work, but only`
	`8`	`+# work on. This makes eg rust-analyzer check-on-save and autocomplete work, but only`
`9`	`9`	`# in these crates, without any feature conflict.`
`10`	`10`	`#`
`11`	`11`	# Copy this file to `Cargo.toml` and uncomment one group of crates below.
`12`	`12`	`#`
`13`	`13`	# `/Cargo.toml` is already in .gitignore, so you don't commit it accidentally.
`14`	`14`
`15`	`15`	`[workspace]`
	`16`	`+resolver = "2"`
`16`	`17`	`members = [`
`17`	`18`	`# Uncomment ONLY ONE of the hals below, depending on your target`
`18`	`19`	`# "nrf52810-hal",`