refactor(tvix/eval): Builderize Evaluation
Make constructing of a new Evaluation use the builder pattern rather than setting public mutable fields. This is currently a pure refactor (no functionality has changed) but has a few advantages: - We've encapsulated the internals of the fields in Evaluation, meaning we can change them without too much breakage of clients - We have type safety that prevents us from ever changing the fields of an Evaluation after it's built (which matters more in a world where we reuse Evaluations). More importantly, this paves the road for doing different things with the construction of an Evaluation - notably, sharing certain things like the GlobalsMap across subsequent evaluations in eg the REPL. Fixes: b/262 Change-Id: I4a27116faac14cdd144fc7c992d14ae095a1aca4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11956 Tested-by: BuildkiteCI Autosubmit: aspen <root@gws.fyi> Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
parent
d5964c1d54
commit
dfe137786c
15 changed files with 325 additions and 154 deletions
|
|
@ -40,22 +40,23 @@ fn interpret(code: &str) {
|
|||
TOKIO_RUNTIME.handle().clone(),
|
||||
));
|
||||
|
||||
let mut eval = tvix_eval::Evaluation::new(
|
||||
Box::new(TvixIO::new(tvix_store_io.clone() as Rc<dyn EvalIO>)) as Box<dyn EvalIO>,
|
||||
true,
|
||||
);
|
||||
let mut eval_builder = tvix_eval::Evaluation::builder(Box::new(TvixIO::new(
|
||||
tvix_store_io.clone() as Rc<dyn EvalIO>,
|
||||
)) as Box<dyn EvalIO>)
|
||||
.enable_import()
|
||||
.add_builtins(impure_builtins());
|
||||
|
||||
eval.builtins.extend(impure_builtins());
|
||||
add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io));
|
||||
add_fetcher_builtins(&mut eval, Rc::clone(&tvix_store_io));
|
||||
add_import_builtins(&mut eval, tvix_store_io);
|
||||
configure_nix_path(
|
||||
&mut eval,
|
||||
eval_builder = add_derivation_builtins(eval_builder, Rc::clone(&tvix_store_io));
|
||||
eval_builder = add_fetcher_builtins(eval_builder, Rc::clone(&tvix_store_io));
|
||||
eval_builder = add_import_builtins(eval_builder, tvix_store_io);
|
||||
eval_builder = configure_nix_path(
|
||||
eval_builder,
|
||||
// The benchmark requires TVIX_BENCH_NIX_PATH to be set, so barf out
|
||||
// early, rather than benchmarking tvix returning an error.
|
||||
&Some(env::var("TVIX_BENCH_NIX_PATH").expect("TVIX_BENCH_NIX_PATH must be set")),
|
||||
);
|
||||
|
||||
let eval = eval_builder.build();
|
||||
let result = eval.evaluate(code, None);
|
||||
|
||||
assert!(result.errors.is_empty());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue