difftreelog
style fix formatting
in: master
3 files changed
Cargo.tomldiffbeforeafterboth1[workspace]2members = [3 "crates/*",4 "bindings/jrsonnet-web",5 "bindings/jsonnet",6 "cmds/*",7 "tests",8 "xtask",9]10default-members = ["cmds/jrsonnet", "cmds/jrsonnet-fmt", "cmds/jrb", "bindings/jsonnet"]11resolver = "2"1213[workspace.package]14authors = ["Yaroslav Bolyukin <iam@lach.pw>"]15edition = "2024"16license = "MIT"17repository = "https://github.com/CertainLach/jrsonnet"18version = "0.5.0-pre98"1920[workspace.dependencies]21jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0-pre98" }22jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0-pre98" }23jrsonnet-ir = { path = "./crates/jrsonnet-ir", version = "0.5.0-pre98" }24jrsonnet-ir-parser = { path = "./crates/jrsonnet-ir-parser", version = "0.5.0-pre98" }25jrsonnet-peg-parser = { path = "./crates/jrsonnet-peg-parser", version = "0.5.0-pre98" }26jrsonnet-rowan-parser = { path = "./crates/jrsonnet-rowan-parser", version = "0.5.0-pre98" }27jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0-pre98" }28jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0-pre98" }29jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre98" }30jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre98" }31jrsonnet-formatter = { path = "./crates/jrsonnet-formatter", version = "0.5.0-pre98" }32jrsonnet-lexer = { path = "./crates/jrsonnet-lexer", version = "0.5.0-pre98" }33jrsonnet-pkg = { path = "./crates/jrsonnet-pkg", version = "0.5.0-pre98" }34jrsonnet-gcmodule = { version = "0.5.0" }35# Diagnostics.36# hi-doc is my library, which handles text formatting very well, but isn't polished enough yet37# Previous implementation was based on annotate-snippets, which I don't like for many reasons.38#39# I'm against using miette, because I want to reuse data between interpreter and annotations, yet miette40# and other libraries want to handle spans etc by itself, which is okay for compiler diagnostics, but is41# bad for interpreter, where interpreter and parser are paired much closer.42hi-doc = { version = "0.3.0", default-features = false }4344# CLI45clap = "4.5"46clap_complete = "4.5"4748# Parsing, manifestification is implemented manually everywhere49serde = "1.0.228"50serde_json = "1.0.149"51serde-saphyr = { version = "0.0.26", default-features = false, features = [52 "deserialize",53] }5455# Error handling56anyhow = "1.0.101"57thiserror = "2.0.18"5859# Code formatting60dprint-core = "0.67.4"6162# Evaluator63stacker = "0.1.23"64smallvec = "1.15.1"65educe = { version = "0.6.0", default-features = false }66url = "2.5.8"67rustversion = "1.0.22"6869# Stdlib hashing functions70md5 = "0.8.0"71sha1 = "0.11.0"72sha2 = "0.11.0"73sha3 = "0.11.0"74hex = "0.4.3"7576# Source code parsing.77# Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.78# First (and fast one) is based on peg, second is based on rowan.79peg = "0.8.5"80logos = "0.16.1"81ungrammar = "1.16.1"82rowan = "0.16.1"8384mimallocator = "0.1.3"85indoc = "2.0"86tempfile = "3.24"87pathdiff = "0.2.3"88hashbrown = "0.17.0"89static_assertions = "1.1"90rustc-hash = "2.1"91num-bigint = "0.4.6"92strsim = "0.11.1"93proc-macro2 = "1.0"94quote = "1.0"95syn = "2.0"96drop_bomb = "0.1.5"97base64 = "0.22.1"98indexmap = "2.13.0"99itertools = "0.14.0"100xshell = "0.2.7"101102regex = "1.12"103lru = "0.18.0"104105syn-dissect-closure = "0.1.0"106107# Tests/benchmarks108insta = { version = "1.46", features = ["glob"] }109criterion = { version = "0.8" }110strip-ansi-escapes = "0.2.1"111nix = { version = "0.31", features = ["process"] }112113# Web114wasm-bindgen = "=0.2.106"115wasm-bindgen-futures = "0.4.56"116js-sys = "0.3.83"117console_error_panic_hook = "0.1"118getrandom = "0.3.4"119120# Bundler121tracing = "0.1.44"122tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }123reqwest = { version = "0.13", features = [124 "blocking",125 "rustls",126], default-features = false }127zip = { version = "8", default-features = false, features = ["deflate"] }128directories = "6.0.0"129gix = { version = "0.83.0", features = [130 "blocking-network-client",131 "blocking-http-transport-reqwest-rust-tls",132] }133camino = { version = "1.2.2", features = ["serde1"] }134135[workspace.lints.rust]136unsafe_op_in_unsafe_fn = "deny"137138# TODO: add docs everywhere139# missing_doc = "warn"140141elided_lifetimes_in_paths = "allow"142explicit_outlives_requirements = "allow"143noop_method_call = "allow"144single_use_lifetimes = "allow"145variant_size_differences = "allow"146macro_expanded_macro_exports_accessed_by_absolute_paths = "allow"147148[workspace.lints.rustdoc]149all = "warn"150151[workspace.lints.clippy]152all = { level = "warn", priority = -1 }153nursery = { level = "warn", priority = -1 }154pedantic = { level = "warn", priority = -1 }155156ptr_arg = "allow"157# Too verbose158must_use_candidate = "allow"159# A lot of functions pass around errors thrown by code160missing_errors_doc = "allow"161# A lot of pointers have interior Rc162needless_pass_by_value = "allow"163# Its fine164wildcard_imports = "allow"165enum_glob_use = "allow"166module_name_repetitions = "allow"167# False positives168# https://github.com/rust-lang/rust-clippy/issues/6902169use_self = "allow"170# https://github.com/rust-lang/rust-clippy/issues/8539171iter_with_drain = "allow"172type_repetition_in_bounds = "allow"173# ci is being run with nightly, but library should work on stable174missing_const_for_fn = "allow"175# too many false-positives with .expect() calls176missing_panics_doc = "allow"177# false positive for IStr type. There is an configuration option for178# such cases, but it doesn't work:179# https://github.com/rust-lang/rust-clippy/issues/9801180mutable_key_type = "allow"181# false positives182redundant_pub_crate = "allow"183# Sometimes code is fancier without that184manual_let_else = "allow"185# Something is broken about that lint, can't be allowed for186# codegenerated-stdlib block187similar_names = "allow"188189[profile.release]190opt-level = 3191lto = "fat"192codegen-units = 1193debug = 0194panic = "abort"195strip = true196197[profile.releasedebug]198inherits = "release"199debug = 2200panic = "unwind"201strip = false1[workspace]2members = [3 "crates/*",4 "bindings/jrsonnet-web",5 "bindings/jsonnet",6 "cmds/*",7 "tests",8 "xtask",9]10default-members = [11 "cmds/jrsonnet",12 "cmds/jrsonnet-fmt",13 "cmds/jrb",14 "bindings/jsonnet",15]16resolver = "2"1718[workspace.package]19authors = ["Yaroslav Bolyukin <iam@lach.pw>"]20edition = "2024"21license = "MIT"22repository = "https://github.com/CertainLach/jrsonnet"23version = "0.5.0-pre98"2425[workspace.dependencies]26jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0-pre98" }27jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0-pre98" }28jrsonnet-ir = { path = "./crates/jrsonnet-ir", version = "0.5.0-pre98" }29jrsonnet-ir-parser = { path = "./crates/jrsonnet-ir-parser", version = "0.5.0-pre98" }30jrsonnet-peg-parser = { path = "./crates/jrsonnet-peg-parser", version = "0.5.0-pre98" }31jrsonnet-rowan-parser = { path = "./crates/jrsonnet-rowan-parser", version = "0.5.0-pre98" }32jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0-pre98" }33jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0-pre98" }34jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre98" }35jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre98" }36jrsonnet-formatter = { path = "./crates/jrsonnet-formatter", version = "0.5.0-pre98" }37jrsonnet-lexer = { path = "./crates/jrsonnet-lexer", version = "0.5.0-pre98" }38jrsonnet-pkg = { path = "./crates/jrsonnet-pkg", version = "0.5.0-pre98" }39jrsonnet-gcmodule = { version = "0.5.0" }40# Diagnostics.41# hi-doc is my library, which handles text formatting very well, but isn't polished enough yet42# Previous implementation was based on annotate-snippets, which I don't like for many reasons.43#44# I'm against using miette, because I want to reuse data between interpreter and annotations, yet miette45# and other libraries want to handle spans etc by itself, which is okay for compiler diagnostics, but is46# bad for interpreter, where interpreter and parser are paired much closer.47hi-doc = { version = "0.3.0", default-features = false }4849# CLI50clap = "4.5"51clap_complete = "4.5"5253# Parsing, manifestification is implemented manually everywhere54serde = "1.0.228"55serde_json = "1.0.149"56serde-saphyr = { version = "0.0.26", default-features = false, features = [57 "deserialize",58] }5960# Error handling61anyhow = "1.0.101"62thiserror = "2.0.18"6364# Code formatting65dprint-core = "0.67.4"6667# Evaluator68stacker = "0.1.23"69smallvec = "1.15.1"70educe = { version = "0.6.0", default-features = false }71url = "2.5.8"72rustversion = "1.0.22"7374# Stdlib hashing functions75md5 = "0.8.0"76sha1 = "0.11.0"77sha2 = "0.11.0"78sha3 = "0.11.0"79hex = "0.4.3"8081# Source code parsing.82# Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.83# First (and fast one) is based on peg, second is based on rowan.84peg = "0.8.5"85logos = "0.16.1"86ungrammar = "1.16.1"87rowan = "0.16.1"8889mimallocator = "0.1.3"90indoc = "2.0"91tempfile = "3.24"92pathdiff = "0.2.3"93hashbrown = "0.17.0"94static_assertions = "1.1"95rustc-hash = "2.1"96num-bigint = "0.4.6"97strsim = "0.11.1"98proc-macro2 = "1.0"99quote = "1.0"100syn = "2.0"101drop_bomb = "0.1.5"102base64 = "0.22.1"103indexmap = "2.13.0"104itertools = "0.14.0"105xshell = "0.2.7"106107regex = "1.12"108lru = "0.18.0"109110syn-dissect-closure = "0.1.0"111112# Tests/benchmarks113insta = { version = "1.46", features = ["glob"] }114criterion = { version = "0.8" }115strip-ansi-escapes = "0.2.1"116nix = { version = "0.31", features = ["process"] }117118# Web119wasm-bindgen = "=0.2.106"120wasm-bindgen-futures = "0.4.56"121js-sys = "0.3.83"122console_error_panic_hook = "0.1"123getrandom = "0.3.4"124125# Bundler126tracing = "0.1.44"127tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }128reqwest = { version = "0.13", features = [129 "blocking",130 "rustls",131], default-features = false }132zip = { version = "8", default-features = false, features = ["deflate"] }133directories = "6.0.0"134gix = { version = "0.83.0", features = [135 "blocking-network-client",136 "blocking-http-transport-reqwest-rust-tls",137] }138camino = { version = "1.2.2", features = ["serde1"] }139140[workspace.lints.rust]141unsafe_op_in_unsafe_fn = "deny"142143# TODO: add docs everywhere144# missing_doc = "warn"145146elided_lifetimes_in_paths = "allow"147explicit_outlives_requirements = "allow"148noop_method_call = "allow"149single_use_lifetimes = "allow"150variant_size_differences = "allow"151macro_expanded_macro_exports_accessed_by_absolute_paths = "allow"152153[workspace.lints.rustdoc]154all = "warn"155156[workspace.lints.clippy]157all = { level = "warn", priority = -1 }158nursery = { level = "warn", priority = -1 }159pedantic = { level = "warn", priority = -1 }160161ptr_arg = "allow"162# Too verbose163must_use_candidate = "allow"164# A lot of functions pass around errors thrown by code165missing_errors_doc = "allow"166# A lot of pointers have interior Rc167needless_pass_by_value = "allow"168# Its fine169wildcard_imports = "allow"170enum_glob_use = "allow"171module_name_repetitions = "allow"172# False positives173# https://github.com/rust-lang/rust-clippy/issues/6902174use_self = "allow"175# https://github.com/rust-lang/rust-clippy/issues/8539176iter_with_drain = "allow"177type_repetition_in_bounds = "allow"178# ci is being run with nightly, but library should work on stable179missing_const_for_fn = "allow"180# too many false-positives with .expect() calls181missing_panics_doc = "allow"182# false positive for IStr type. There is an configuration option for183# such cases, but it doesn't work:184# https://github.com/rust-lang/rust-clippy/issues/9801185mutable_key_type = "allow"186# false positives187redundant_pub_crate = "allow"188# Sometimes code is fancier without that189manual_let_else = "allow"190# Something is broken about that lint, can't be allowed for191# codegenerated-stdlib block192similar_names = "allow"193194[profile.release]195opt-level = 3196lto = "fat"197codegen-units = 1198debug = 0199panic = "abort"200strip = true201202[profile.releasedebug]203inherits = "release"204debug = 2205panic = "unwind"206strip = falsecrates/jrsonnet-pkg/src/install/accessor.rsdiffbeforeafterboth--- a/crates/jrsonnet-pkg/src/install/accessor.rs
+++ b/crates/jrsonnet-pkg/src/install/accessor.rs
@@ -113,7 +113,9 @@
continue;
};
let Ok(target) = LocalSource::from_str(target_str) else {
- warn!("symlink target {target_str:?} at {name:?} escapes sandbox; skipping");
+ warn!(
+ "symlink target {target_str:?} at {name:?} escapes sandbox; skipping"
+ );
continue;
};
AccessorEntry::Symlink(target)
nix/benchmarks.nixdiffbeforeafterboth--- a/nix/benchmarks.nix
+++ b/nix/benchmarks.nix
@@ -118,26 +118,22 @@
)
} \
${
- optionalString (skipRustAlternative == "")
- "\"rsjsonnet $path${jpathArgs}\" -n \"Rust (alternative, rsjsonnet)\""
- } \
- ${
- optionalString (skipGo == "")
- "\"go-jsonnet $path${jpathArgs}\" -n \"Go\""
+ optionalString (
+ skipRustAlternative == ""
+ ) "\"rsjsonnet $path${jpathArgs}\" -n \"Rust (alternative, rsjsonnet)\""
} \
+ ${optionalString (skipGo == "") "\"go-jsonnet $path${jpathArgs}\" -n \"Go\""} \
${
- optionalString (skipScala == "")
- "\"sjsonnet-native $path${jpathArgs}\" -n \"Scala (native)\""
+ optionalString (skipScala == "") "\"sjsonnet-native $path${jpathArgs}\" -n \"Scala (native)\""
} \
${
# My aarch64-linux machine can't run graalvm image:
# The current machine does not support all of the following CPU features that are required by the image: [FP, ASIMD, CRC32, LSE].
- optionalString (skipScala == "" && stdenv.hostPlatform.system != "aarch64-linux")
- "\"sjsonnet-graalvm $path${jpathArgs}\" -n \"Scala (GraalVM)\""
+ optionalString (
+ skipScala == "" && stdenv.hostPlatform.system != "aarch64-linux"
+ ) "\"sjsonnet-graalvm $path${jpathArgs}\" -n \"Scala (GraalVM)\""
} \
- ${optionalString (skipCpp == "")
- "\"jsonnet $path${jpathArgs}\" -n \"C++\""
- }
+ ${optionalString (skipCpp == "") "\"jsonnet $path${jpathArgs}\" -n \"C++\""}
cat result.adoc >> $out
'';
in