Bug 1893057 - build: patch plist to work with indexmap 2.* r=glandium,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D208796

Cargo.lock

@@ -4523,11 +4523,9 @@ dependencies = [
 [[package]]
 name = "plist"
 version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"
 dependencies = [
  "base64 0.13.999",
- "indexmap 1.9.3",
+ "indexmap 2.999.999",
  "line-wrap",
  "serde",
  "time 0.3.23",

Cargo.toml

@@ -192,6 +192,9 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
 # Workaround for https://github.com/rust-lang/cargo/issues/11232
 rure = { path = "third_party/rust/rure" }
 
+# Patch `plist` to work with `indexmap` 2.*
+plist = { path = "third_party/rust/plist" }
+
 # To-be-published changes.
 unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" }
 

supply-chain/config.toml

@@ -161,6 +161,10 @@ audit-as-crates-io = false
 [policy.peek-poke-derive]
 audit-as-crates-io = false
 
+[policy.plist]
+audit-as-crates-io = true
+notes = "This is the upstream code plus one local fix, see bug 1874167."
+
 [policy.pulse]
 audit-as-crates-io = false
 notes = "This is a first-party crate which is entirely unrelated to the crates.io package of the same name."

third_party/rust/plist/Cargo.toml

@@ -24,7 +24,7 @@ repository = "https://github.com/ebarnard/rust-plist/"
 version = "0.13.0"
 
 [dependencies.indexmap]
-version = "1.0.2"
+version = "2.1.0"
 
 [dependencies.line-wrap]
 version = "0.1.1"

third_party/rust/plist/src/lib.rs

@@ -72,6 +72,8 @@
 //! specify a tilde requirement e.g. `plist = "~1.0.3"` in you `Cargo.toml` so that the plist crate
 //! is not automatically updated to version 1.1.
 
+#![allow(warnings)] // Third-party
+
 pub mod dictionary;
 
 #[cfg(feature = "enable_unstable_features_that_may_break_with_minor_version_bumps")]

third_party/rust/plist/src/stream/binary_writer.rs

@@ -577,7 +577,7 @@ fn is_even(value: usize) -> bool {
 fn value_mut<'a>(
     values: &'a mut IndexMap<Value<'static>, ValueState>,
     value_index: usize,
-) -> (&'a mut Value<'static>, &'a mut ValueState) {
+) -> (&'a Value<'static>, &'a mut ValueState) {
     values
         .get_index_mut(value_index)
         .expect("internal consistency error")