git.delta.rocks / jrsonnet / refs/commits / a0a8eb40815a

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,12 +143,6 @@
 ]
 
 [[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
 name = "getrandom"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -249,7 +243,7 @@
  "rustc-hash",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml_with_quirks",
  "static_assertions",
  "strsim",
  "thiserror",
@@ -548,12 +542,13 @@
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.8.21"
-source = "git+https://github.com/CertainLach/serde-yaml?branch=feature/old-octals-quirk#4bf0e325243539fdeb419e8d727ed1c161cbe445"
+name = "serde_yaml_with_quirks"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47c5983eba86eae2d0058c35fb1065ccffb23af7f8965871069269088098321a"
 dependencies = [
- "dtoa",
  "indexmap",
+ "ryu",
  "serde",
  "yaml-rust",
 ]

--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -34,7 +34,7 @@
 
 pathdiff = "0.2.1"
 hashbrown = "0.12.1"
-static_assertions = "1.1.0"
+static_assertions = "1.1"
 
 md5 = "0.7.0"
 base64 = "0.13.0"
@@ -44,7 +44,7 @@
 
 serde = "1.0"
 serde_json = "1.0"
-serde_yaml = { git = "https://github.com/CertainLach/serde-yaml", branch = "feature/old-octals-quirk" }
+serde_yaml_with_quirks = "0.8.24"
 
 anyhow = { version = "1.0", optional = true }
 # Friendly errors

--- a/crates/jrsonnet-evaluator/src/stdlib/mod.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/mod.rs
@@ -7,7 +7,7 @@
 use jrsonnet_gcmodule::Cc;
 use jrsonnet_interner::{IBytes, IStr};
 use serde::Deserialize;
-use serde_yaml::DeserializingQuirks;
+use serde_yaml_with_quirks::DeserializingQuirks;
 
 use crate::{
 	error::{Error::*, Result},
@@ -219,7 +219,7 @@
 #[jrsonnet_macros::builtin]
 fn builtin_parse_yaml(st: State, s: IStr) -> Result<Any> {
 	use serde_json::Value;
-	let value = serde_yaml::Deserializer::from_str_with_quirks(
+	let value = serde_yaml_with_quirks::Deserializer::from_str_with_quirks(
 		&s,
 		DeserializingQuirks { old_octals: true },
 	);

13jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }13jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
14jrsonnet-gcmodule = { version = "0.3.4" }14jrsonnet-gcmodule = { version = "0.3.4" }
1515
16static_assertions = "1.1.0"16static_assertions = "1.1"
1717
18peg = "0.8.0"18peg = "0.8.0"
1919