diff options
author | Florian Klink <flokli@flokli.de> | 2023-12-30T20·36+0100 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-12-31T13·15+0000 |
commit | 4fba57c2c90f2e7b02da9187e59f8d64deef3fb2 (patch) | |
tree | 9e29cd30ab4a9c060bc15550ddca400f6af03da4 /corp/tvixbolt/src/main.rs | |
parent | a5c5f1a29e8e9b39314a3ab024e170745ac96a3e (diff) |
refactor(tvix/eval): remove code and location from struct r/7289
Instead, it's passed in the evaluate/compile_only functions, which feels more naturally. It lets us set up the Evaluation struct long before we actually feed it with data to evaluate. Now that Evaluation::new() would be accepting an empty list of arguments, we can simply implement Default, making things a bit more idiomatic. Change-Id: I4369658634909a0c504fdffa18242a130daa0239 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10475 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'corp/tvixbolt/src/main.rs')
-rw-r--r-- | corp/tvixbolt/src/main.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/corp/tvixbolt/src/main.rs b/corp/tvixbolt/src/main.rs index 0de48b3ac71e..5a4f25088114 100644 --- a/corp/tvixbolt/src/main.rs +++ b/corp/tvixbolt/src/main.rs @@ -286,7 +286,7 @@ fn eval(model: &Model) -> Output { return out; } - let mut eval = tvix_eval::Evaluation::new(&model.code, Some("/nixbolt".into())); + let mut eval = tvix_eval::Evaluation::default(); let source = eval.source_map(); let result = { @@ -298,7 +298,7 @@ fn eval(model: &Model) -> Output { eval.runtime_observer = Some(&mut runtime_observer); } - eval.evaluate() + eval.evaluate(&model.code, Some("/nixbolt".into())) }; if model.display_ast { |