From 2bb1d2d2b97fae14d88461f214d821e7181e962b Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Sun, 16 Nov 2025 12:14:47 +0100 Subject: [PATCH] chore: update ron to 0.12 --- Cargo.lock | 54 +++++++++++++++++++++++++++----------- insta/Cargo.toml | 2 +- insta/src/serialization.rs | 12 +++++---- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 991eb26e..ebe574b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,16 +12,19 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.13.1" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +dependencies = [ + "serde_core", +] [[package]] name = "block-buffer" @@ -141,7 +144,7 @@ version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_lex", "is-terminal", "strsim", @@ -579,7 +582,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -613,13 +616,16 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "ron" -version = "0.7.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" dependencies = [ - "base64", - "bitflags", + "bitflags 2.10.0", + "once_cell", "serde", + "serde_derive", + "typeid", + "unicode-ident", ] [[package]] @@ -643,7 +649,7 @@ version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -677,18 +683,28 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.164" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -814,6 +830,12 @@ dependencies = [ "serde", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" version = "1.15.0" diff --git a/insta/Cargo.toml b/insta/Cargo.toml index 969bcf3b..1c8d563a 100644 --- a/insta/Cargo.toml +++ b/insta/Cargo.toml @@ -48,7 +48,7 @@ csv = { version = "1.1.6", optional = true } console = { version = "0.15.4", optional = true, default-features = false } pest = { version = "2.1.3", optional = true } pest_derive = { version = "2.1.0", optional = true } -ron = { version = "0.7.1", optional = true } +ron = { version = "0.12.0", optional = true } toml = { version = "0.5.7", optional = true } globset = { version = ">= 0.4.6, < 0.4.17", optional = true } walkdir = { version = "2.3.1", optional = true } diff --git a/insta/src/serialization.rs b/insta/src/serialization.rs index a7d9277b..5041811e 100644 --- a/insta/src/serialization.rs +++ b/insta/src/serialization.rs @@ -1,5 +1,7 @@ use serde::de::value::Error as ValueError; use serde::Serialize; +#[cfg(feature = "ron")] +use std::borrow::Cow; use crate::content::{json, yaml, Content, ContentSerializer}; use crate::settings::Settings; @@ -61,19 +63,19 @@ pub fn serialize_content(mut content: Content, format: SerializationFormat) -> S } #[cfg(feature = "ron")] SerializationFormat::Ron => { - let mut buf = Vec::new(); + let mut buf = String::new(); let mut config = ron::ser::PrettyConfig::new(); - config.new_line = "\n".to_string(); - config.indentor = " ".to_string(); + config.new_line = Cow::Borrowed("\n"); + config.indentor = Cow::Borrowed(" "); config.struct_names = true; let mut serializer = ron::ser::Serializer::with_options( &mut buf, Some(config), - ron::options::Options::default(), + &ron::options::Options::default(), ) .unwrap(); content.serialize(&mut serializer).unwrap(); - String::from_utf8(buf).unwrap() + buf } #[cfg(feature = "toml")] SerializationFormat::Toml => {