difftreelog
style fix formatting
in: master
3 files changed
Cargo.tomldiffbeforeafterboth11 "cmds/jrsonnet",12 "cmds/jrsonnet-fmt",13 "cmds/jrb",14 "bindings/jsonnet",15]11resolver = "2"16resolver = "2"1217crates/jrsonnet-pkg/src/install/accessor.rsdiffbeforeafterbothno syntactic changes
nix/benchmarks.nixdiffbeforeafterboth68 let68 let69 jpathArgs = concatMapStrings (p: " -J ${p}") jpaths;69 jpathArgs = concatMapStrings (p: " -J ${p}") jpaths;70 in70 in71 ''71 ''72 echo >> $out72 echo >> $out73 echo "=== ${name}" >> $out73 echo "=== ${name}" >> $out74 echo >> $out74 echo >> $out75 ${optionalString (skipRustAlternative != "") ''75 ${optionalString (skipRustAlternative != "") ''76 echo "> Note: No results for Rust (alternative), ${skipRustAlternative}" >> $out76 echo "> Note: No results for Rust (alternative), ${skipRustAlternative}" >> $out77 echo >> $out77 echo >> $out78 ''}78 ''}79 ${optionalString (skipGo != "") ''79 ${optionalString (skipGo != "") ''80 echo "> Note: No results for Go, ${skipGo}" >> $out80 echo "> Note: No results for Go, ${skipGo}" >> $out81 echo >> $out81 echo >> $out82 ''}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}" >> $out85 echo >> $out85 echo >> $out86 ''}86 ''}87 ${optionalString (skipCpp != "") ''87 ${optionalString (skipCpp != "") ''88 echo "> Note: No results for C++, ${skipCpp}" >> $out88 echo "> Note: No results for C++, ${skipCpp}" >> $out89 echo >> $out89 echo >> $out90 ''}90 ''}91 ${optionalString (!omitSource) ''91 ${optionalString (!omitSource) ''92 echo ".Source" >> $out92 echo ".Source" >> $out93 echo "[%collapsible]" >> $out93 echo "[%collapsible]" >> $out94 echo "====" >> $out94 echo "====" >> $out95 echo "[source,jsonnet]" >> $out95 echo "[source,jsonnet]" >> $out96 echo "----" >> $out96 echo "----" >> $out97 ${optionalString pathIsGenerator "echo \"// Generator source\" >> $out"}97 ${optionalString pathIsGenerator "echo \"// Generator source\" >> $out"}98 cat ${path} >> $out98 cat ${path} >> $out99 echo >> $out99 echo >> $out100 echo "----" >> $out100 echo "----" >> $out101 echo "====" >> $out101 echo "====" >> $out102 echo >> $out102 echo >> $out103 ''}103 ''}104 path=${path}104 path=${path}105 ${optionalString pathIsGenerator ''105 ${optionalString pathIsGenerator ''106 go-jsonnet $path > generated.jsonnet106 go-jsonnet $path > generated.jsonnet107 path=generated.jsonnet107 path=generated.jsonnet108 ''}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 >> $out141 cat result.adoc >> $out138 '';142 '';143 in139 in144 ''140 ''145 set -oux141 set -oux