From eccec91940e163e4f5b3e4a335edfd6755bb534e Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sun, 22 Jan 2023 23:09:48 +0000 Subject: [PATCH] fix: upgrade gcmodule --- --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "version_check", ] @@ -84,12 +84,6 @@ [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" @@ -138,15 +132,6 @@ checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ "os_str_bytes", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", ] [[package]] @@ -326,9 +311,9 @@ [[package]] name = "jrsonnet-gcmodule" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d4e1572e4b61e4f5deb3701312a330df0e69b48805a540d740e5e53ac8c78a" +checksum = "35243aa6a013032e9469f3798c54e2ca7af44973b1eafdc924cb6ca351a71f72" dependencies = [ "jrsonnet-gcmodule-derive", "parking_lot", @@ -336,9 +321,9 @@ [[package]] name = "jrsonnet-gcmodule-derive" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae2f3bf7d38e0a9098b5b9062a7d9e7a97a206bc3c91118d76e7e37f2e0f1202" +checksum = "96206bf4ae74d5257bbbd23113bfe67b09e8973de3843b728c3ce289dee86eda" dependencies = [ "proc-macro2", "quote", @@ -433,10 +418,11 @@ [[package]] name = "lock_api" -version = "0.3.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ + "autocfg", "scopeguard", ] @@ -479,9 +465,9 @@ [[package]] name = "parking_lot" -version = "0.10.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -489,16 +475,15 @@ [[package]] name = "parking_lot_core" -version = "0.7.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ - "cfg-if 0.1.10", - "cloudabi", + "cfg-if", "libc", "redox_syscall", "smallvec", - "winapi", + "windows-sys", ] [[package]] @@ -578,9 +563,12 @@ [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] [[package]] name = "rustc-hash" @@ -663,7 +651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,10 @@ jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre6" } jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre6" } -[profile.test] -opt-level = 1 +jrsonnet-gcmodule = "0.3.5" + +#[profile.test] +#opt-level = 1 [profile.release] opt-level = 3 --- a/bindings/jsonnet/Cargo.toml +++ b/bindings/jsonnet/Cargo.toml @@ -11,7 +11,7 @@ jrsonnet-evaluator.workspace = true jrsonnet-parser.workspace = true jrsonnet-stdlib.workspace = true -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true [lib] name = "jsonnet" --- a/cmds/jrsonnet/Cargo.toml +++ b/cmds/jrsonnet/Cargo.toml @@ -29,7 +29,7 @@ jrsonnet-evaluator.workspace = true jrsonnet-parser.workspace = true jrsonnet-cli.workspace = true -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true mimallocator = { version = "0.1.3", optional = true } thiserror = "1.0" --- a/crates/jrsonnet-cli/Cargo.toml +++ b/crates/jrsonnet-cli/Cargo.toml @@ -17,6 +17,6 @@ jrsonnet-evaluator = { workspace = true, features = ["explaining-traces"] } jrsonnet-parser.workspace = true jrsonnet-stdlib.workspace = true -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true clap = { version = "4.0", features = ["derive"] } --- a/crates/jrsonnet-evaluator/Cargo.toml +++ b/crates/jrsonnet-evaluator/Cargo.toml @@ -33,7 +33,7 @@ jrsonnet-parser.workspace = true jrsonnet-types.workspace = true jrsonnet-macros.workspace = true -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true pathdiff = "0.2.1" hashbrown = "0.13.2" --- a/crates/jrsonnet-interner/Cargo.toml +++ b/crates/jrsonnet-interner/Cargo.toml @@ -16,7 +16,7 @@ serde = ["dep:serde"] [dependencies] -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true serde = { version = "1.0", optional = true } structdump = { version = "0.2.0", optional = true } --- a/crates/jrsonnet-parser/Cargo.toml +++ b/crates/jrsonnet-parser/Cargo.toml @@ -27,7 +27,7 @@ [dependencies] jrsonnet-interner.workspace = true -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true static_assertions = "1.1" --- a/crates/jrsonnet-stdlib/Cargo.toml +++ b/crates/jrsonnet-stdlib/Cargo.toml @@ -21,7 +21,7 @@ jrsonnet-evaluator.workspace = true jrsonnet-macros.workspace = true jrsonnet-parser.workspace = true -jrsonnet-gcmodule = "0.3.4" +jrsonnet-gcmodule.workspace = true # Used for stdlib AST serialization bincode = { version = "1.3", optional = true } --- a/crates/jrsonnet-types/Cargo.toml +++ b/crates/jrsonnet-types/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] -jrsonnet-gcmodule = { version = "0.3.4" } +jrsonnet-gcmodule.workspace = true peg = "0.8.1" --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -5,7 +5,7 @@ publish = false [dependencies] -jrsonnet-evaluator = { path = "../crates/jrsonnet-evaluator" } -jrsonnet-gcmodule = "0.3.4" -jrsonnet-stdlib = { path = "../crates/jrsonnet-stdlib" } +jrsonnet-evaluator.workspace = true +jrsonnet-gcmodule.workspace = true +jrsonnet-stdlib.workspace = true serde = "1.0.142" -- gitstuff