git.delta.rocks / jrsonnet / refs/commits / 7d0b3bd3121d

difftreelog

style fix formatting

vsxrysykYaroslav Bolyukin2026-05-07parent: #3ab5bdb.patch.diff
in: master

3 files changed

modifiedCargo.tomldiffbeforeafterboth
11 "cmds/jrsonnet",
12 "cmds/jrsonnet-fmt",
13 "cmds/jrb",
14 "bindings/jsonnet",
15]
11resolver = "2"16resolver = "2"
1217
modifiedcrates/jrsonnet-pkg/src/install/accessor.rsdiffbeforeafterboth

no syntactic changes

modifiednix/benchmarks.nixdiffbeforeafterboth
68 let68 let
69 jpathArgs = concatMapStrings (p: " -J ${p}") jpaths;69 jpathArgs = concatMapStrings (p: " -J ${p}") jpaths;
70 in70 in
71 ''71 ''
72 echo >> $out72 echo >> $out
73 echo "=== ${name}" >> $out73 echo "=== ${name}" >> $out
74 echo >> $out74 echo >> $out
75 ${optionalString (skipRustAlternative != "") ''75 ${optionalString (skipRustAlternative != "") ''
76 echo "> Note: No results for Rust (alternative), ${skipRustAlternative}" >> $out76 echo "> Note: No results for Rust (alternative), ${skipRustAlternative}" >> $out
77 echo >> $out77 echo >> $out
78 ''}78 ''}
79 ${optionalString (skipGo != "") ''79 ${optionalString (skipGo != "") ''
80 echo "> Note: No results for Go, ${skipGo}" >> $out80 echo "> Note: No results for Go, ${skipGo}" >> $out
81 echo >> $out81 echo >> $out
82 ''}82 ''}
83 ${optionalString (skipScala != "") ''83 ${optionalString (skipScala != "") ''
84 echo "> Note: No results for Scala (native)/Scala (GraalVM), ${skipScala}" >> $out84 echo "> Note: No results for Scala (native)/Scala (GraalVM), ${skipScala}" >> $out
85 echo >> $out85 echo >> $out
86 ''}86 ''}
87 ${optionalString (skipCpp != "") ''87 ${optionalString (skipCpp != "") ''
88 echo "> Note: No results for C++, ${skipCpp}" >> $out88 echo "> Note: No results for C++, ${skipCpp}" >> $out
89 echo >> $out89 echo >> $out
90 ''}90 ''}
91 ${optionalString (!omitSource) ''91 ${optionalString (!omitSource) ''
92 echo ".Source" >> $out92 echo ".Source" >> $out
93 echo "[%collapsible]" >> $out93 echo "[%collapsible]" >> $out
94 echo "====" >> $out94 echo "====" >> $out
95 echo "[source,jsonnet]" >> $out95 echo "[source,jsonnet]" >> $out
96 echo "----" >> $out96 echo "----" >> $out
97 ${optionalString pathIsGenerator "echo \"// Generator source\" >> $out"}97 ${optionalString pathIsGenerator "echo \"// Generator source\" >> $out"}
98 cat ${path} >> $out98 cat ${path} >> $out
99 echo >> $out99 echo >> $out
100 echo "----" >> $out100 echo "----" >> $out
101 echo "====" >> $out101 echo "====" >> $out
102 echo >> $out102 echo >> $out
103 ''}103 ''}
104 path=${path}104 path=${path}
105 ${optionalString pathIsGenerator ''105 ${optionalString pathIsGenerator ''
106 go-jsonnet $path > generated.jsonnet106 go-jsonnet $path > generated.jsonnet
107 path=generated.jsonnet107 path=generated.jsonnet
108 ''}108 ''}
109 hyperfine -N -w4 -m20 --output=pipe --style=basic --export-asciidoc result.adoc \109 hyperfine -N -w4 -m20 --output=pipe --style=basic --export-asciidoc result.adoc \
110 ${110 ${
111 concatStringsSep " " (111 concatStringsSep " " (
112 forEach jrsonnetVariants (112 forEach jrsonnetVariants (
113 variant:113 variant:
114 "\"${variant.drv}/bin/jrsonnet $path${jpathArgs}\" -n \"Rust${114 "\"${variant.drv}/bin/jrsonnet $path${jpathArgs}\" -n \"Rust${
115 if variant.name != "" then " (${variant.name})" else ""115 if variant.name != "" then " (${variant.name})" else ""
116 }\""116 }\""
117 )117 )
118 )118 )
119 } \119 } \
120 ${120 ${
121 optionalString (skipRustAlternative == "")121 optionalString (
122 skipRustAlternative == ""
122 "\"rsjsonnet $path${jpathArgs}\" -n \"Rust (alternative, rsjsonnet)\""123 ) "\"rsjsonnet $path${jpathArgs}\" -n \"Rust (alternative, rsjsonnet)\""
123 } \124 } \
124 ${125 ${optionalString (skipGo == "") "\"go-jsonnet $path${jpathArgs}\" -n \"Go\""} \
125 optionalString (skipGo == "")
126 "\"go-jsonnet $path${jpathArgs}\" -n \"Go\""
127 } \126 ${
128 ${127 optionalString (skipScala == "") "\"sjsonnet-native $path${jpathArgs}\" -n \"Scala (native)\""
129 optionalString (skipScala == "")
130 "\"sjsonnet-native $path${jpathArgs}\" -n \"Scala (native)\""128 } \
131 } \129 ${
132 ${130 # My aarch64-linux machine can't run graalvm image:
133 # My aarch64-linux machine can't run graalvm image:131 # The current machine does not support all of the following CPU features that are required by the image: [FP, ASIMD, CRC32, LSE].
134 # The current machine does not support all of the following CPU features that are required by the image: [FP, ASIMD, CRC32, LSE].132 optionalString (
135 optionalString (skipScala == "" && stdenv.hostPlatform.system != "aarch64-linux")133 skipScala == "" && stdenv.hostPlatform.system != "aarch64-linux"
136 "\"sjsonnet-graalvm $path${jpathArgs}\" -n \"Scala (GraalVM)\""134 ) "\"sjsonnet-graalvm $path${jpathArgs}\" -n \"Scala (GraalVM)\""
137 } \135 } \
138 ${optionalString (skipCpp == "")136 ${optionalString (skipCpp == "") "\"jsonnet $path${jpathArgs}\" -n \"C++\""}
139 "\"jsonnet $path${jpathArgs}\" -n \"C++\""
140 }137 cat result.adoc >> $out
141 cat result.adoc >> $out138 '';
142 '';
143 in139 in
144 ''140 ''
145 set -oux141 set -oux