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

difftreelog

fix avoid problematic serde release

Yaroslav Bolyukin2023-08-19parent: #19baaf2.patch.diff
in: master
It doesn't work with the downstream nix users of jrsonnet, and may cause
security issues.

Upstream issue: https://github.com/serde-rs/serde/issues/2538

7 files changed

modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,9 @@
 
 jrsonnet-gcmodule = "0.3.6"
 
+# <= 1.0.171 due to serde-rs/serde#2538
+serde = { version = ">= 1.0.126, <= 1.0.171" }
+
 #[profile.test]
 #opt-level = 1
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -42,3 +42,5 @@
 thiserror = "1.0"
 clap = { version = "4.1", features = ["derive"] }
 clap_complete = { version = "4.1" }
+serde_json = "1.0.104"
+serde = { workspace = true, features = ["derive"] }
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -47,7 +47,7 @@
 # Friendly errors
 strsim = { version = "0.10.0" }
 
-serde = "1.0"
+serde.workspace = true
 
 anyhow = { version = "1.0", optional = true }
 # Serialized stdlib
modifiedcrates/jrsonnet-interner/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -19,7 +19,7 @@
 [dependencies]
 jrsonnet-gcmodule.workspace = true
 
-serde = { version = "1.0", optional = true }
+serde = { workspace = true, optional = true }
 structdump = { version = "0.2.0", optional = true }
 
 rustc-hash = "1.1"
modifiedcrates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth
before · crates/jrsonnet-parser/Cargo.toml
1[package]2name = "jrsonnet-parser"3description = "jsonnet language parser and AST"4version.workspace = true5repository.workspace = true6authors = ["Yaroslav Bolyukin <iam@lach.pw>"]7license = "MIT"8edition = "2021"910[features]11default = []12exp-destruct = []13exp-null-coaelse = []14# Implement serialization of AST using structdump15#16# Structdump generates code, which exactly replicated passed AST17# Contrary to serde, has no code bloat problem, and is recommended18#19# The only limitation is serialized form is only useable if built from build script20structdump = ["dep:structdump", "jrsonnet-interner/structdump"]21# Implement serialization of AST using serde22#23# Warning: as serde doesn't deduplicate strings, `Source` struct will bloat24# output binary with repeating source code. To resolve this issue, you should either25# override serialization of this struct using custom `Serializer`/`Deserializer`,26# not rely on Source, and fill its `source_code` with empty value, or use `structdump`27# instead28serde = ["dep:serde"]2930[dependencies]31jrsonnet-interner.workspace = true32jrsonnet-gcmodule.workspace = true3334static_assertions = "1.1"3536peg = "0.8.1"3738serde = { version = "1.0", features = ["derive", "rc"], optional = true }39structdump = { version = "0.2.0", features = ["derive"], optional = true }
modifiedcrates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -30,7 +30,7 @@
 # Used for stdlib AST serialization
 bincode = { version = "1.3", optional = true }
 # Used both for stdlib AST serialization and std.parseJson/std.parseYaml
-serde = "1.0"
+serde.workspace = true
 
 # std.md5
 md5 = "0.7.0"
modifiedtests/Cargo.tomldiffbeforeafterboth
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -8,4 +8,4 @@
 jrsonnet-evaluator.workspace = true
 jrsonnet-gcmodule.workspace = true
 jrsonnet-stdlib.workspace = true
-serde = "1.0.142"
+serde.workspace = true