Skip to content

Commit

Permalink
Merge pull request #136 from CertainLach/updates-deps
Browse files Browse the repository at this point in the history
build(dep): update dependencies and share their versions
  • Loading branch information
CertainLach authored Oct 29, 2023
2 parents ad1f65c + 9ead896 commit e5639a3
Show file tree
Hide file tree
Showing 15 changed files with 317 additions and 219 deletions.
323 changes: 182 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

49 changes: 47 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,54 @@ jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre95" }
jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre95" }

jrsonnet-gcmodule = "0.3.6"
ass-stroke = { git = "https://github.com/CertainLach/ass-stroke", version = "0.1.0" }

# <= 1.0.171 due to serde-rs/serde#2538
serde = { version = ">= 1.0.126, <= 1.0.171" }
serde = "1.0.190"
serde_json = "1.0.107"
serde_yaml_with_quirks = "0.8.24"

anyhow = "1.0.48"
thiserror = "1.0"
mimallocator = "0.1.3"
indoc = "2.0"
dprint-core = "0.63.2"
insta = "1.15"
tempfile = "3.8"
pathdiff = "0.2.1"
hashbrown = "0.14.2"
static_assertions = "1.1"
rustc-hash = "1.1"
bincode = "1.3"
annotate-snippets = "0.9.1"
async-trait = "0.1.60"
num-bigint = "0.4.3"
derivative = "2.2.0"
strsim = "0.10.0"
structdump = "0.2.0"
proc-macro2 = "1.0"
quote = "1.0"
syn = "2.0"
peg = "0.8.2"
drop_bomb = "0.1.5"
logos = "0.13.0"
miette = "5.5.0"
rowan = "0.15"
text-size = "1.1"
md5 = "0.7.0"
sha1 = "0.10.5"
sha2 = "0.10.6"
sha3 = "0.10.8"
base64 = "0.21.0"
indexmap = "2.0.2"
itertools = "0.11.0"
ungrammar = "1.16.1"
xshell = "0.2.2"

clap = "4.4"
clap_complete = "4.4"

lsp-server = "0.7.4"
lsp-types = "0.94.1"

#[profile.test]
#opt-level = 1
Expand Down
14 changes: 7 additions & 7 deletions cmds/jrsonnet-fmt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version.workspace = true
edition = "2021"

[dependencies]
dprint-core = "0.63.2"
dprint-core.workspace = true
jrsonnet-rowan-parser.workspace = true
insta = "1.15"
indoc = "1.0"
ass-stroke = { git = "https://github.com/CertainLach/ass-stroke.git", version = "0.1.0" }
clap = { version = "4.4.2", features = ["derive"] }
tempfile = "3.8.0"
thiserror = "1.0.48"
insta.workspace = true
indoc.workspace = true
ass-stroke.workspace = true
clap = { workspace = true, features = ["derive"] }
tempfile.workspace = true
thiserror.workspace = true
10 changes: 5 additions & 5 deletions cmds/jrsonnet-lsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version.workspace = true
edition = "2021"

[dependencies]
anyhow = "1.0.48"
anyhow.workspace = true
jrsonnet-evaluator.workspace = true
jrsonnet-rowan-parser.workspace = true
lsp-server = "0.6.0"
lsp-types = "0.93.0"
serde = "1.0.130"
serde_json = "1.0.71"
lsp-server.workspace = true
lsp-types.workspace = true
serde.workspace = true
serde_json.workspace = true
32 changes: 23 additions & 9 deletions cmds/jrsonnet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,33 @@ license = "MIT"
edition = "2021"

[features]
experimental = ["exp-preserve-order", "exp-destruct", "exp-null-coaelse", "exp-object-iteration", "exp-bigint", "exp-apply"]
experimental = [
"exp-preserve-order",
"exp-destruct",
"exp-null-coaelse",
"exp-object-iteration",
"exp-bigint",
"exp-apply",
]
# Use mimalloc as allocator
mimalloc = ["mimallocator"]
# Experimental feature, which allows to preserve order of object fields
exp-preserve-order = ["jrsonnet-evaluator/exp-preserve-order", "jrsonnet-cli/exp-preserve-order"]
exp-preserve-order = [
"jrsonnet-evaluator/exp-preserve-order",
"jrsonnet-cli/exp-preserve-order",
]
# Destructuring of locals
exp-destruct = ["jrsonnet-evaluator/exp-destruct"]
# Iteration over objects yields [key, value] elements
exp-object-iteration = ["jrsonnet-evaluator/exp-object-iteration"]
# Bigint type
exp-bigint = ["jrsonnet-evaluator/exp-bigint", "jrsonnet-cli/exp-bigint"]
# obj?.field, obj?.['field']
exp-null-coaelse = ["jrsonnet-evaluator/exp-null-coaelse", "jrsonnet-parser/exp-null-coaelse", "jrsonnet-cli/exp-null-coaelse"]
exp-null-coaelse = [
"jrsonnet-evaluator/exp-null-coaelse",
"jrsonnet-parser/exp-null-coaelse",
"jrsonnet-cli/exp-null-coaelse",
]
# --exp-apply
exp-apply = []

Expand All @@ -35,10 +49,10 @@ jrsonnet-parser.workspace = true
jrsonnet-cli.workspace = true
jrsonnet-gcmodule.workspace = true

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"
mimallocator = { workspace = true, optional = true }
thiserror.workspace = true
clap = { workspace = true, features = ["derive"] }
clap_complete.workspace = true
serde_json.workspace = true
serde = { workspace = true, features = ["derive"] }
ass-stroke = { git = "https://github.com/CertainLach/ass-stroke", version = "0.1.0" }
ass-stroke.workspace = true
2 changes: 1 addition & 1 deletion crates/jrsonnet-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jrsonnet-parser.workspace = true
jrsonnet-stdlib.workspace = true
jrsonnet-gcmodule.workspace = true

clap = { version = "4.1", features = ["derive"] }
clap = { workspace = true, features = ["derive"] }
24 changes: 12 additions & 12 deletions crates/jrsonnet-evaluator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ jrsonnet-types.workspace = true
jrsonnet-macros.workspace = true
jrsonnet-gcmodule.workspace = true

pathdiff = "0.2.1"
hashbrown = "0.13.2"
static_assertions = "1.1"
pathdiff.workspace = true
hashbrown.workspace = true
static_assertions.workspace = true

rustc-hash = "1.1"
rustc-hash.workspace = true

thiserror = "1.0"
thiserror.workspace = true
# Friendly errors
strsim = { version = "0.10.0" }
strsim.workspace = true

serde.workspace = true

anyhow = { version = "1.0", optional = true }
anyhow = { workspace = true, optional = true }
# Serialized stdlib
bincode = { version = "1.3", optional = true }
bincode = { workspace = true, optional = true }
# Explaining traces
annotate-snippets = { version = "0.9.1", features = ["color"], optional = true }
annotate-snippets = { workspace = true, features = ["color"], optional = true }
# Async imports
async-trait = { version = "0.1.60", optional = true }
async-trait = { workspace = true, optional = true }
# Bigint
num-bigint = { version = "0.4.3", features = ["serde"], optional = true }
derivative = "2.2.0"
num-bigint = { workspace = true, features = ["serde"], optional = true }
derivative.workspace = true
6 changes: 3 additions & 3 deletions crates/jrsonnet-interner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde = ["dep:serde"]
jrsonnet-gcmodule.workspace = true

serde = { workspace = true, optional = true }
structdump = { version = "0.2.0", optional = true }
structdump = { workspace = true, optional = true }

rustc-hash = "1.1"
hashbrown = { version = "0.13.2", features = ["inline-more"] }
rustc-hash.workspace = true
hashbrown = { workspace = true, features = ["inline-more"] }
6 changes: 3 additions & 3 deletions crates/jrsonnet-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ edition = "2021"
proc-macro = true

[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0", features = ["full"] }
proc-macro2.workspace = true
quote.workspace = true
syn = { workspace = true, features = ["full"] }
4 changes: 2 additions & 2 deletions crates/jrsonnet-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ where
{
let attrs = attrs
.iter()
.filter(|a| a.path.is_ident(&ident))
.filter(|a| a.path().is_ident(&ident))
.collect::<Vec<_>>();
if attrs.len() > 1 {
return Err(Error::new(
Expand Down Expand Up @@ -177,7 +177,7 @@ impl ArgInfo {
let cfg_attrs = arg
.attrs
.iter()
.filter(|a| a.path.is_ident("cfg"))
.filter(|a| a.path().is_ident("cfg"))
.cloned()
.collect();

Expand Down
6 changes: 3 additions & 3 deletions crates/jrsonnet-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ serde = ["dep:serde"]
jrsonnet-interner.workspace = true
jrsonnet-gcmodule.workspace = true

static_assertions = "1.1"
static_assertions.workspace = true

peg = "0.8.1"
peg.workspace = true

serde = { workspace = true, features = ["derive", "rc"], optional = true }
structdump = { version = "0.2.0", features = ["derive"], optional = true }
structdump = { workspace = true, features = ["derive"], optional = true }
24 changes: 11 additions & 13 deletions crates/jrsonnet-rowan-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ version.workspace = true
edition = "2021"

[dependencies]
anyhow = "1.0"
backtrace = "0.3.63"
drop_bomb = "0.1.5"
indoc = "1.0"
logos = "0.12"
miette = { version = "5.5.0", features = ["fancy"] }
rowan = "0.15"
text-size = "1.1"
thiserror = "1.0"
anyhow.workspace = true
drop_bomb.workspace = true
indoc.workspace = true
logos.workspace = true
miette = { workspace = true, features = ["fancy"] }
rowan.workspace = true
text-size.workspace = true
thiserror.workspace = true

[dev-dependencies]
backtrace = "0.3.63"
indoc = "1.0"
insta = "1.15"
anyhow = "1.0"
indoc.workspace = true
insta.workspace = true
anyhow.workspace = true
20 changes: 10 additions & 10 deletions crates/jrsonnet-stdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@ jrsonnet-parser.workspace = true
jrsonnet-gcmodule.workspace = true

# Used for stdlib AST serialization
bincode = { version = "1.3", optional = true }
bincode = { workspace = true, optional = true }
# Used both for stdlib AST serialization and std.parseJson/std.parseYaml
serde.workspace = true

# std.md5
md5 = "0.7.0"
md5.workspace = true
# std.sha1
sha1 = "0.10.5"
sha1.workspace = true
# std.sha256, std.sha512
sha2 = "0.10.6"
sha2.workspace = true
# std.sha3
sha3 = "0.10.8"
sha3.workspace = true
# std.base64
base64 = "0.21.0"
base64.workspace = true
# std.parseJson
serde_json = "1.0"
serde_json.workspace = true
# std.parseYaml, custom library fork is used for C++/golang compatibility
serde_yaml_with_quirks = "0.8.24"
serde_yaml_with_quirks.workspace = true

num-bigint = { version = "0.4.3", optional = true }
num-bigint = { workspace = true, optional = true }

[build-dependencies]
jrsonnet-parser.workspace = true
structdump = { version = "0.2.0", features = ["derive"] }
structdump = { workspace = true, features = ["derive"] }
2 changes: 1 addition & 1 deletion crates/jrsonnet-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
jrsonnet-gcmodule.workspace = true

peg = "0.8.1"
peg.workspace = true

[features]
exp-bigint = []
14 changes: 7 additions & 7 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0.57"
indexmap = "1.9.0"
itertools = "0.10.3"
proc-macro2 = "1.0.39"
quote = "1.0.18"
ungrammar = "1.16.1"
xshell = "0.2.2"
anyhow.workspace = true
indexmap.workspace = true
itertools.workspace = true
proc-macro2.workspace = true
quote.workspace = true
ungrammar.workspace = true
xshell.workspace = true

0 comments on commit e5639a3

Please sign in to comment.