Switch to using the Cargo Resolver v2

The main issue here is that Askama 0.10 isn't compatible with it, so I needed to update Askama then fix the breakage in nimbus-fml.
mozilla · Sep 27, 2023 · b9bf2a3 · b9bf2a3
1 parent 65283ab
commit b9bf2a3
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 174 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,6 @@
 [workspace]
+resolver = "2"
+
 # Note: Any additions here should be repeated in default-members below.
 members = [
     "components/as-ohttp-client",

diff --git a/components/support/nimbus-fml/Cargo.toml b/components/support/nimbus-fml/Cargo.toml
@@ -20,7 +20,7 @@ serde_json = "1"
 serde_yaml = "0.8.21"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0.29"
-askama = "0.10.5"
+askama = "0.12"
 textwrap = "0.14.2"
 heck = "0.3.3"
 unicode-segmentation = "1.8.0"