Bug 1785002 - Update serde_yaml to 0.8.26. r=emilio,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D154750
2022-08-16 21:19:42 +00:00 · 2022-08-16 21:19:42 +00:00 · 1a9bbd5f34
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4742,9 +4742,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
 "indexmap",
 "ryu",
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@ -592,6 +592,11 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-run"
 delta = "0.1.8 -> 0.1.9"

+[[audits.serde_yaml]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-run"
+delta = "0.8.24 -> 0.8.26"
+
 [[audits.svg_fmt]]
 who = "Bobby Holley <bobbyholley@gmail.com>"
 criteria = "safe-to-deploy"
--- a/third_party/rust/serde_yaml/.cargo-checksum.json
+++ b/third_party/rust/serde_yaml/.cargo-checksum.json
@ -1 +1 @@
-{"files":{"Cargo.toml":"66bbb18c70aea793b25fbf7b4adccc409f34a1ec709523b295ffbfd50ae59f4a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"be2c0345796f9f9c75078549fced7f0c54f0874912d219edaf8abc2c75ae4935","src/de.rs":"98be0ec59da4b6f69a54b0bfaa199b1b021527e9e36872df3f8a864f203f353c","src/error.rs":"96a49b8ea102d010760b3ade9b475d0c88d4014c17625302ddc145a9fea2988c","src/lib.rs":"2419656c478fc7459b40373babad9f8cce32d05a5b2475aa6779503733e44d84","src/mapping.rs":"6607911090c89a41ade38f1717b9c0bd6c3c253cc4711890b77b2bda18d6bac7","src/number.rs":"4edf78ad75bf66bae31c1ee4d785ba2b7a2c14c082802d54c9feb93067bcf063","src/path.rs":"44d339ce1814effd10ba131ae0393df215f09dbfb35ab4d678f49d4081f58dd4","src/ser.rs":"543ead5db73f3b22f0936f3980531d49e5acabf54cd7c66f92bbb4c0547bb018","src/value/de.rs":"84b213b23a8d4bf6bd9aacd18fc1091254382c4edc479f9a9abc87c416b370f0","src/value/from.rs":"cd66c76c4ab03bed32f8c4b22ffbd96274a837d587624a62d0584c7090633862","src/value/index.rs":"16f0e4fecd4a4cd149af89a7426864f58735f7dacc90f33d92c647b044c8f112","src/value/mod.rs":"171a98133de3445ccd4cfa3991b5c3f96baa1c05542fc1927e6eccf3e4ddbe09","src/value/partial_eq.rs":"0b28c8d2f10a58581dbe2a69d25742fa0f8bf3da797f3046e38e300d1f9691bf","src/value/ser.rs":"7ddb9bfadfbfe16a79c872888ea25f8fb7df14b862fea47dd603d576e162db86","tests/test_de.rs":"41911d6392b5704240ee147e2c146371f479b9115cdaf7e0e8639529d0bc1251","tests/test_error.rs":"4ef5c9001f140e1aee1e9d6238c668d26b5b264e237773741d5f65bfff036e75","tests/test_serde.rs":"e237e3144ce0ba943ed37d645f7ccede98c6ea0368e12fde88c4eede650c80d4","tests/test_value.rs":"e9424b8ee13c18c4375c3a7e1af25047e2ef3efb117b1413334c0950c912937a"},"package":"707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"}
+{"files":{"Cargo.toml":"1e01ffba9fa6c48ceda8bd7b3b936b5909c7adbfb05b6a5f8deb3f679d7da37e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"8b6df65d390bc4f9d5e05d0a4ccc860d6e5dc2668d82cd304e6c95b472a21f35","src/de.rs":"414b82334d78cf57b7cdc2fc1ed000594791b2f675648f5286678370f460a74d","src/error.rs":"96a49b8ea102d010760b3ade9b475d0c88d4014c17625302ddc145a9fea2988c","src/lib.rs":"a3276a7da395021e34547fe2f4336a5658f07d4d606a865b707a592f7b084e10","src/mapping.rs":"6607911090c89a41ade38f1717b9c0bd6c3c253cc4711890b77b2bda18d6bac7","src/number.rs":"4edf78ad75bf66bae31c1ee4d785ba2b7a2c14c082802d54c9feb93067bcf063","src/path.rs":"44d339ce1814effd10ba131ae0393df215f09dbfb35ab4d678f49d4081f58dd4","src/ser.rs":"e32c77b3e8087ca1b68a8f093e9f1e27b93ad1aac70a9bb22054b4179973cae1","src/value/de.rs":"84b213b23a8d4bf6bd9aacd18fc1091254382c4edc479f9a9abc87c416b370f0","src/value/from.rs":"cd66c76c4ab03bed32f8c4b22ffbd96274a837d587624a62d0584c7090633862","src/value/index.rs":"16f0e4fecd4a4cd149af89a7426864f58735f7dacc90f33d92c647b044c8f112","src/value/mod.rs":"171a98133de3445ccd4cfa3991b5c3f96baa1c05542fc1927e6eccf3e4ddbe09","src/value/partial_eq.rs":"0b28c8d2f10a58581dbe2a69d25742fa0f8bf3da797f3046e38e300d1f9691bf","src/value/ser.rs":"7ddb9bfadfbfe16a79c872888ea25f8fb7df14b862fea47dd603d576e162db86","tests/test_de.rs":"c7d8d71e8b0aa966ad4003657c1024405abeca0d49aec9f66f749db81bb1f061","tests/test_error.rs":"4ef5c9001f140e1aee1e9d6238c668d26b5b264e237773741d5f65bfff036e75","tests/test_serde.rs":"56aa2623b1aca1ba00d028edc60d6f74cde6eba83529d5bcd3340c4b0487db04","tests/test_value.rs":"f360eeaa7d281d52df18a452a6f67c6095bcf50b92f1a87c5a9e3c27b7a69f33"},"package":"578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"}
--- a/third_party/rust/serde_yaml/Cargo.toml
+++ b/third_party/rust/serde_yaml/Cargo.toml
@ -10,10 +10,10 @@
 # See Cargo.toml.orig for the original contents.

 [package]
-edition = "2018"
-rust-version = "1.46"
+edition = "2021"
+rust-version = "1.56"
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "YAML support for Serde"
 documentation = "https://docs.rs/serde_yaml/"
@ -22,8 +22,10 @@ keywords = [
    "yaml",
    "serde",
 ]
+categories = ["encoding"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/serde-yaml"
+resolver = "2"

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/third_party/rust/serde_yaml/README.md
+++ b/third_party/rust/serde_yaml/README.md
@ -3,7 +3,7 @@ Serde YAML

 [<img alt="github" src="https://img.shields.io/badge/github-dtolnay/serde--yaml-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/serde-yaml)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/serde_yaml.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/serde_yaml)
-[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-serde__yaml-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/serde_yaml)
+[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-serde__yaml-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs" height="20">](https://docs.rs/serde_yaml)
 [<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/serde-yaml/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/serde-yaml/actions?query=branch%3Amaster)

 This crate is a Rust library for using the [Serde] serialization framework with
--- a/third_party/rust/serde_yaml/src/de.rs
+++ b/third_party/rust/serde_yaml/src/de.rs
@ -951,38 +951,35 @@ where
    if v == "false" {
        return visitor.visit_bool(false);
    }
-    if v.starts_with("0x") || v.starts_with("+0x") {
-        let start = 2 + v.starts_with('+') as usize;
-        if let Ok(n) = u64::from_str_radix(&v[start..], 16) {
+    if let Some(rest) = Option::or(v.strip_prefix("0x"), v.strip_prefix("+0x")) {
+        if let Ok(n) = u64::from_str_radix(rest, 16) {
            return visitor.visit_u64(n);
        }
    }
-    if v.starts_with("-0x") {
-        let negative = format!("-{}", &v[3..]);
+    if let Some(rest) = v.strip_prefix("-0x") {
+        let negative = format!("-{}", rest);
        if let Ok(n) = i64::from_str_radix(&negative, 16) {
            return visitor.visit_i64(n);
        }
    }
-    if v.starts_with("0o") || v.starts_with("+0o") {
-        let start = 2 + v.starts_with('+') as usize;
-        if let Ok(n) = u64::from_str_radix(&v[start..], 8) {
+    if let Some(rest) = Option::or(v.strip_prefix("0o"), v.strip_prefix("+0o")) {
+        if let Ok(n) = u64::from_str_radix(rest, 8) {
            return visitor.visit_u64(n);
        }
    }
-    if v.starts_with("-0o") {
-        let negative = format!("-{}", &v[3..]);
+    if let Some(rest) = v.strip_prefix("-0o") {
+        let negative = format!("-{}", rest);
        if let Ok(n) = i64::from_str_radix(&negative, 8) {
            return visitor.visit_i64(n);
        }
    }
-    if v.starts_with("0b") || v.starts_with("+0b") {
-        let start = 2 + v.starts_with('+') as usize;
-        if let Ok(n) = u64::from_str_radix(&v[start..], 2) {
+    if let Some(rest) = Option::or(v.strip_prefix("0b"), v.strip_prefix("+0b")) {
+        if let Ok(n) = u64::from_str_radix(rest, 2) {
            return visitor.visit_u64(n);
        }
    }
-    if v.starts_with("-0b") {
-        let negative = format!("-{}", &v[3..]);
+    if let Some(rest) = v.strip_prefix("-0b") {
+        let negative = format!("-{}", rest);
        if let Ok(n) = i64::from_str_radix(&negative, 2) {
            return visitor.visit_i64(n);
        }
@ -1009,7 +1006,7 @@ where
    if let Ok(n) = v.parse() {
        return visitor.visit_i128(n);
    }
-    match trim_start_matches(v, '+') {
+    match v.trim_start_matches('+') {
        ".inf" | ".Inf" | ".INF" => return visitor.visit_f64(f64::INFINITY),
        _ => (),
    }
@ -1027,14 +1024,6 @@ where
    visitor.visit_str(v)
 }

-#[allow(deprecated)]
-fn trim_start_matches(s: &str, pat: char) -> &str {
-    // str::trim_start_matches was added in 1.30, trim_left_matches deprecated
-    // in 1.33. We currently support rustc back to 1.17 so we need to continue
-    // to use the deprecated one.
-    s.trim_left_matches(pat)
-}
-
 fn invalid_type(event: &Event, exp: &dyn Expected) -> Error {
    enum Void {}

--- a/third_party/rust/serde_yaml/src/lib.rs
+++ b/third_party/rust/serde_yaml/src/lib.rs
@ -2,7 +2,7 @@
 //!
 //! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
 //! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K
+//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
 //!
 //! <br>
 //!
@ -65,7 +65,7 @@
 //! }
 //! ```

-#![doc(html_root_url = "https://docs.rs/serde_yaml/0.8.24")]
+#![doc(html_root_url = "https://docs.rs/serde_yaml/0.8.26")]
 #![deny(missing_docs)]
 // Suppressed clippy_pedantic lints
 #![allow(
@ -76,8 +76,10 @@
    clippy::should_implement_trait,
    // things are often more readable this way
    clippy::cast_lossless,
+    clippy::checked_conversions,
    clippy::if_not_else,
    clippy::manual_assert,
+    clippy::match_like_matches_macro,
    clippy::match_same_arms,
    clippy::module_name_repetitions,
    clippy::needless_pass_by_value,
@ -88,6 +90,7 @@
    clippy::blocks_in_if_conditions,
    clippy::cast_possible_wrap,
    clippy::cast_precision_loss,
+    clippy::derive_partial_eq_without_eq,
    clippy::doc_markdown,
    clippy::items_after_statements,
    clippy::return_self_not_must_use,
--- a/third_party/rust/serde_yaml/src/ser.rs
+++ b/third_party/rust/serde_yaml/src/ser.rs
@ -48,6 +48,12 @@ where
        }
    }

+    /// Calls [`.flush()`](io::Write::flush) on the underlying `io::Write`
+    /// object.
+    pub fn flush(&mut self) -> io::Result<()> {
+        self.writer.flush()
+    }
+
    /// Unwrap the underlying `io::Write` object from the `Serializer`.
    pub fn into_inner(self) -> W {
        self.writer
--- a/third_party/rust/serde_yaml/tests/test_de.rs
+++ b/third_party/rust/serde_yaml/tests/test_de.rs
@ -1,4 +1,8 @@
-#![allow(clippy::cast_lossless, clippy::cast_possible_wrap)]
+#![allow(
+    clippy::cast_lossless,
+    clippy::cast_possible_wrap,
+    clippy::derive_partial_eq_without_eq
+)]

 use indoc::indoc;
 use serde_derive::Deserialize;
--- a/third_party/rust/serde_yaml/tests/test_serde.rs
+++ b/third_party/rust/serde_yaml/tests/test_serde.rs
@ -1,5 +1,6 @@
 #![allow(
    clippy::decimal_literal_representation,
+    clippy::derive_partial_eq_without_eq,
    clippy::unreadable_literal,
    clippy::shadow_unrelated
 )]
--- a/third_party/rust/serde_yaml/tests/test_value.rs
+++ b/third_party/rust/serde_yaml/tests/test_value.rs
@ -1,4 +1,4 @@
-#![allow(clippy::eq_op)]
+#![allow(clippy::derive_partial_eq_without_eq, clippy::eq_op)]

 use serde::de::IntoDeserializer;
 use serde::Deserialize;