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

difftreelog

build switch to released serde_yaml fork

Yaroslav Bolyukin2022-06-05parent: #87ee065.patch.diff
in: master

4 files changed

modifiedCargo.lockdiffbeforeafterboth
--- 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",
 ]
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
before · crates/jrsonnet-evaluator/Cargo.toml
1[package]2name = "jrsonnet-evaluator"3description = "jsonnet interpreter"4version = "0.4.2"5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]6license = "MIT"7edition = "2021"89[features]10default = ["serialized-stdlib", "explaining-traces", "friendly-errors"]11# Serializes standard library AST instead of parsing them every run12serialized-stdlib = ["bincode", "jrsonnet-parser/serde"]13# Rustc-like trace visualization14explaining-traces = ["annotate-snippets"]15# Allows library authors to throw custom errors16anyhow-error = ["anyhow"]17# Provides helpful explaintations to errors, at cost of adding18# more dependencies and slowing down error path19friendly-errors = ["strsim"]2021# Allows to preserve field order in objects22exp-preserve-order = []23exp-serde-preserve-order = ["serde_json/preserve_order"]24# Implements field destructuring25exp-destruct = ["jrsonnet-parser/exp-destruct"]2627[dependencies]28jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }29jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }30jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }31jrsonnet-types = { path = "../jrsonnet-types", version = "0.4.2" }32jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" }33jrsonnet-gcmodule = { version = "0.3.4" }3435pathdiff = "0.2.1"36hashbrown = "0.12.1"37static_assertions = "1.1.0"3839md5 = "0.7.0"40base64 = "0.13.0"41rustc-hash = "1.1"4243thiserror = "1.0"4445serde = "1.0"46serde_json = "1.0"47serde_yaml = { git = "https://github.com/CertainLach/serde-yaml", branch = "feature/old-octals-quirk" }4849anyhow = { version = "1.0", optional = true }50# Friendly errors51strsim = { version = "0.10.0", optional = true }52# Serialized stdlib53bincode = { version = "1.3", optional = true }54# Explaining traces55annotate-snippets = { version = "0.9.1", features = ["color"], optional = true }5657[build-dependencies]58jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }59jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }60serde = "1.0"61bincode = "1.3"
after · crates/jrsonnet-evaluator/Cargo.toml
1[package]2name = "jrsonnet-evaluator"3description = "jsonnet interpreter"4version = "0.4.2"5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]6license = "MIT"7edition = "2021"89[features]10default = ["serialized-stdlib", "explaining-traces", "friendly-errors"]11# Serializes standard library AST instead of parsing them every run12serialized-stdlib = ["bincode", "jrsonnet-parser/serde"]13# Rustc-like trace visualization14explaining-traces = ["annotate-snippets"]15# Allows library authors to throw custom errors16anyhow-error = ["anyhow"]17# Provides helpful explaintations to errors, at cost of adding18# more dependencies and slowing down error path19friendly-errors = ["strsim"]2021# Allows to preserve field order in objects22exp-preserve-order = []23exp-serde-preserve-order = ["serde_json/preserve_order"]24# Implements field destructuring25exp-destruct = ["jrsonnet-parser/exp-destruct"]2627[dependencies]28jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }29jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }30jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }31jrsonnet-types = { path = "../jrsonnet-types", version = "0.4.2" }32jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" }33jrsonnet-gcmodule = { version = "0.3.4" }3435pathdiff = "0.2.1"36hashbrown = "0.12.1"37static_assertions = "1.1"3839md5 = "0.7.0"40base64 = "0.13.0"41rustc-hash = "1.1"4243thiserror = "1.0"4445serde = "1.0"46serde_json = "1.0"47serde_yaml_with_quirks = "0.8.24"4849anyhow = { version = "1.0", optional = true }50# Friendly errors51strsim = { version = "0.10.0", optional = true }52# Serialized stdlib53bincode = { version = "1.3", optional = true }54# Explaining traces55annotate-snippets = { version = "0.9.1", features = ["color"], optional = true }5657[build-dependencies]58jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" }59jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }60serde = "1.0"61bincode = "1.3"
modifiedcrates/jrsonnet-evaluator/src/stdlib/mod.rsdiffbeforeafterboth
--- 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 },
 	);
modifiedcrates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -13,7 +13,7 @@
 jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
 jrsonnet-gcmodule = { version = "0.3.4" }
 
-static_assertions = "1.1.0"
+static_assertions = "1.1"
 
 peg = "0.8.0"