git.delta.rocks / jrsonnet / refs/commits / f314b37b4c17

difftreelog

fix benchmarks against release

Yaroslav Bolyukin2024-06-18parent: #bf30e81.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-stdlib/src/objects.rsdiffbeforeafterboth
before · crates/jrsonnet-stdlib/src/objects.rs
1use jrsonnet_evaluator::{2	function::builtin,3	val::{ArrValue, Val},4	IStr, ObjValue, ObjValueBuilder,5};67#[builtin]8pub fn builtin_object_fields_ex(9	obj: ObjValue,10	hidden: bool,1112	#[default(false)]13	#[cfg(feature = "exp-preserve-order")]14	preserve_order: bool,15) -> Vec<Val> {16	let out = obj.fields_ex(17		hidden,18		#[cfg(feature = "exp-preserve-order")]19		preserve_order,20	);21	out.into_iter().map(Val::string).collect::<Vec<_>>()22}2324#[builtin]25pub fn builtin_object_fields(26	o: ObjValue,2728	#[default(false)]29	#[cfg(feature = "exp-preserve-order")]30	preserve_order: bool,31) -> Vec<Val> {32	builtin_object_fields_ex(33		o,34		false,35		#[cfg(feature = "exp-preserve-order")]36		preserve_order,37	)38}3940#[builtin]41pub fn builtin_object_fields_all(42	o: ObjValue,4344	#[default(false)]45	#[cfg(feature = "exp-preserve-order")]46	preserve_order: bool,47) -> Vec<Val> {48	builtin_object_fields_ex(49		o,50		true,51		#[cfg(feature = "exp-preserve-order")]52		preserve_order,53	)54}5556pub fn builtin_object_values_ex(57	o: ObjValue,58	include_hidden: bool,5960	#[default(false)]61	#[cfg(feature = "exp-preserve-order")]62	preserve_order: bool,63) -> ArrValue {64	o.values_ex(65		include_hidden,66		#[cfg(feature = "exp-preserve-order")]67		preserve_order,68	)69}70#[builtin]71pub fn builtin_object_values(72	o: ObjValue,7374	#[default(false)]75	#[cfg(feature = "exp-preserve-order")]76	preserve_order: bool,77) -> ArrValue {78	builtin_object_values_ex(79		o,80		false,81		#[cfg(feature = "exp-preserve-order")]82		preserve_order,83	)84}85#[builtin]86pub fn builtin_object_values_all(87	o: ObjValue,8889	#[default(false)]90	#[cfg(feature = "exp-preserve-order")]91	preserve_order: bool,92) -> ArrValue {93	builtin_object_values_ex(94		o,95		true,96		#[cfg(feature = "exp-preserve-order")]97		preserve_order,98	)99}100101pub fn builtin_object_keys_values_ex(102	o: ObjValue,103	include_hidden: bool,104105	#[default(false)]106	#[cfg(feature = "exp-preserve-order")]107	preserve_order: bool,108) -> ArrValue {109	o.key_values_ex(110		include_hidden,111		#[cfg(feature = "exp-preserve-order")]112		preserve_order,113	)114}115#[builtin]116pub fn builtin_object_keys_values(117	o: ObjValue,118119	#[default(false)]120	#[cfg(feature = "exp-preserve-order")]121	preserve_order: bool,122) -> ArrValue {123	builtin_object_keys_values_ex(124		o,125		false,126		#[cfg(feature = "exp-preserve-order")]127		preserve_order,128	)129}130#[builtin]131pub fn builtin_object_keys_values_all(132	o: ObjValue,133134	#[default(false)]135	#[cfg(feature = "exp-preserve-order")]136	preserve_order: bool,137) -> ArrValue {138	builtin_object_keys_values_ex(139		o,140		true,141		#[cfg(feature = "exp-preserve-order")]142		preserve_order,143	)144}145146#[builtin]147pub fn builtin_object_has_ex(obj: ObjValue, fname: IStr, hidden: bool) -> bool {148	obj.has_field_ex(fname, hidden)149}150151#[builtin]152pub fn builtin_object_has(o: ObjValue, f: IStr) -> bool {153	o.has_field(f)154}155156#[builtin]157pub fn builtin_object_has_all(o: ObjValue, f: IStr) -> bool {158	o.has_field_include_hidden(f)159}160161#[builtin]162pub fn builtin_object_remove_key(163	obj: ObjValue,164	key: IStr,165166	// Standard implementation uses std.objectFields without such argument, we can't167	// assume order preservation should always be enabled/disabled168	#[default(false)]169	#[cfg(feature = "exp-preserve-order")]170	preserve_order: bool,171) -> ObjValue {172	let mut new_obj = ObjValueBuilder::with_capacity(obj.len() - 1);173	for (k, v) in obj.iter(174		#[cfg(feature = "exp-preserve-order")]175		preserve_order,176	) {177		if k == key {178			continue;179		}180		new_obj.field(k).value(v.unwrap());181	}182183	new_obj.build()184}
modifiednix/jrsonnet-release.nixdiffbeforeafterboth
--- a/nix/jrsonnet-release.nix
+++ b/nix/jrsonnet-release.nix
@@ -2,18 +2,21 @@
   fetchFromGitHub,
   rustPlatform,
   makeWrapper,
+  # This derivation should only be used for benchmarks-against-release task
+  forBenchmarks ? true,
+  _unused ? forBenchmarks,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "jrsonnet";
-  version = "pre9";
+  version = "release";
 
   src = fetchFromGitHub {
     owner = "CertainLach";
     repo = pname;
-    rev = "5dc3b98bcc3b9848031f17165bcc2e86e8a65ba3";
-    hash = "sha256-KM1yqsFzt7Vj4xiEzJJiuFaG49/utF80r9A2dSwCAjo=";
+    rev = "ad68a2495da324ce7a893992a6b32851849c64eb";
+    hash = "sha256-N2z0JcJG6iQ+eAE1GGF+c1+T7Pti8oCgx+QWdhT+33M=";
   };
-  cargoHash = "sha256-y2YiktT1h263vpFaC+kRL8yaAWQThhEkS+NSQ6B6Ylk=";
+  cargoHash = "sha256-A/sdqI51kD7Tfo9R95ep2CecaSEzSz3suhZXdND6/nQ=";
 
   cargoTestFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];
   cargoBuildFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];