Skip to content

Commit

Permalink
fix: avoid problematic serde release
Browse files Browse the repository at this point in the history
It doesn't work with the downstream nix users of jrsonnet, and may cause
security issues.

Upstream issue: serde-rs/serde#2538
  • Loading branch information
CertainLach committed Aug 19, 2023
1 parent 19baaf2 commit be1ca0e
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre95" }

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

Expand Down
2 changes: 2 additions & 0 deletions cmds/jrsonnet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ mimallocator = { version = "0.1.3", optional = true }
thiserror = "1.0"
clap = { version = "4.1", features = ["derive"] }
clap_complete = { version = "4.1" }
serde_json = "1.0.104"
serde = { workspace = true, features = ["derive"] }
2 changes: 1 addition & 1 deletion crates/jrsonnet-evaluator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ thiserror = "1.0"
# Friendly errors
strsim = { version = "0.10.0" }

serde = "1.0"
serde.workspace = true

anyhow = { version = "1.0", optional = true }
# Serialized stdlib
Expand Down
2 changes: 1 addition & 1 deletion crates/jrsonnet-interner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = ["dep:serde"]
[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"
Expand Down
2 changes: 1 addition & 1 deletion crates/jrsonnet-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ static_assertions = "1.1"

peg = "0.8.1"

serde = { version = "1.0", features = ["derive", "rc"], optional = true }
serde = { workspace = true, features = ["derive", "rc"], optional = true }
structdump = { version = "0.2.0", features = ["derive"], optional = true }
2 changes: 1 addition & 1 deletion crates/jrsonnet-stdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jrsonnet-gcmodule.workspace = true
# 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"
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ publish = false
jrsonnet-evaluator.workspace = true
jrsonnet-gcmodule.workspace = true
jrsonnet-stdlib.workspace = true
serde = "1.0.142"
serde.workspace = true

0 comments on commit be1ca0e

Please sign in to comment.