cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refact: Inline new_value_function(), a test helper

Browse source 
(cherry picked from commit a354accb952558d30a780eb57fd3161be139db7d)
This commit is contained in:
Robert Hensing 2024-07-19 18:50:10 +02:00
parent b5f9764c4c
commit 5355b663c0
1 changed files with 42 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

100
rust/nix-expr/src/eval_state.rs
View file

@ -539,7 +539,6 @@ mod tests {
use cstr::cstr; use cstr::cstr;
use ctor::ctor; use ctor::ctor;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr;
use std::fs::read_dir; use std::fs::read_dir;
use std::io::Write as _; use std::io::Write as _;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -549,39 +548,6 @@ mod tests {
test_init(); test_init();
} }
/// A worse quality shortcut for calling [new_value_primop].
pub fn new_value_function<const N: usize>(
es: &mut EvalState,
name: &CStr,
f: Box<dyn Fn(&mut EvalState, &[Value; N]) -> Result<Value>>,
) -> Result<Value> {
if N == 0 {
return es.new_value_thunk(
"test_thunk",
Box::new(move |eval_state| {
f(eval_state, {
let empty: &[Value] = &[];
empty.try_into().unwrap()
})
}),
);
}
let args: [&CStr; N] = [cstr!("arg"); N];
let prim = primop::PrimOp::new(
es,
primop::PrimOpMeta {
name,
args,
doc: cstr!("anonymous test function"),
},
f,
)?;
es.new_value_primop(prim)
}
#[test] #[test]
fn eval_state_new_and_drop() { fn eval_state_new_and_drop() {
gc_registering_current_thread(|| { gc_registering_current_thread(|| {
@ -1360,9 +1326,14 @@ mod tests {
let mut es = EvalState::new(store, []).unwrap(); let mut es = EvalState::new(store, []).unwrap();
let bias: Arc<Mutex<Int>> = Arc::new(Mutex::new(0)); let bias: Arc<Mutex<Int>> = Arc::new(Mutex::new(0));
let bias_control = bias.clone(); let bias_control = bias.clone();
let f = new_value_function(
let primop = primop::PrimOp::new(
&mut es, &mut es,
cstr!("testFunction"), primop::PrimOpMeta {
name: cstr!("testFunction"),
args: [cstr!("a"), cstr!("b")],
doc: cstr!("anonymous test function"),
},
Box::new(move |es, [a, b]| { Box::new(move |es, [a, b]| {
let a = es.require_int(a)?; let a = es.require_int(a)?;
let b = es.require_int(b)?; let b = es.require_int(b)?;
@ -1371,6 +1342,9 @@ mod tests {
}), }),
) )
.unwrap(); .unwrap();
let f = es.new_value_primop(primop).unwrap();
{ {
*bias_control.lock().unwrap() = 10; *bias_control.lock().unwrap() = 10;
} }
@ -1392,14 +1366,24 @@ mod tests {
gc_registering_current_thread(|| { gc_registering_current_thread(|| {
let store = Store::open("auto", []).unwrap(); let store = Store::open("auto", []).unwrap();
let mut es = EvalState::new(store, []).unwrap(); let mut es = EvalState::new(store, []).unwrap();
let f = new_value_function( let f = {
&mut es, let es: &mut EvalState = &mut es;
cstr!("throwingTestFunction"), let prim = primop::PrimOp::new(
Box::new(move |es, [a]| { es,
let a = es.require_int(a)?; primop::PrimOpMeta {
bail!("error with arg [{}]", a); name: cstr!("throwingTestFunction"),
}), args: [cstr!("arg")],
) doc: cstr!("anonymous test function"),
},
Box::new(move |es, [a]| {
let a = es.require_int(a)?;
bail!("error with arg [{}]", a);
}),
)
.unwrap();
es.new_value_primop(prim)
}
.unwrap(); .unwrap();
let a = es.new_value_int(2).unwrap(); let a = es.new_value_int(2).unwrap();
let r = es.call(f, a); let r = es.call(f, a);
@ -1421,12 +1405,12 @@ mod tests {
gc_registering_current_thread(|| { gc_registering_current_thread(|| {
let store = Store::open("auto", []).unwrap(); let store = Store::open("auto", []).unwrap();
let mut es = EvalState::new(store, []).unwrap(); let mut es = EvalState::new(store, []).unwrap();
let v = new_value_function( let v = es
&mut es, .new_value_thunk(
cstr!("zeroArgTestFunction"), "test_thunk",
Box::new(move |es, []| Ok(es.new_value_int(42)?)), Box::new(move |es: &mut EvalState| Ok(es.new_value_int(42)?)),
) )
.unwrap(); .unwrap();
es.force(&v).unwrap(); es.force(&v).unwrap();
let t = es.value_type(&v).unwrap(); let t = es.value_type(&v).unwrap();
eprintln!("{:?}", t); eprintln!("{:?}", t);
@ -1442,14 +1426,14 @@ mod tests {
gc_registering_current_thread(|| { gc_registering_current_thread(|| {
let store = Store::open("auto", []).unwrap(); let store = Store::open("auto", []).unwrap();
let mut es = EvalState::new(store, []).unwrap(); let mut es = EvalState::new(store, []).unwrap();
let v = new_value_function( let v = es
&mut es, .new_value_thunk(
cstr!("zeroArgTestFunction"), "test_thunk",
Box::new(move |_es, []| { Box::new(move |_| {
bail!("error message in test case eval_state_primop_anon_call_no_args_lazy") bail!("error message in test case eval_state_primop_anon_call_no_args_lazy")
}), }),
) )
.unwrap(); .unwrap();
let r = es.force(&v); let r = es.force(&v);
match r { match r {
Ok(_) => panic!("expected an error"), Ok(_) => panic!("expected an error"),