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 /tvix/serde | |
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 'tvix/serde')
-rw-r--r-- | tvix/serde/src/de.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/serde/src/de.rs b/tvix/serde/src/de.rs index 2e8a9618e637..500c9c98409d 100644 --- a/tvix/serde/src/de.rs +++ b/tvix/serde/src/de.rs @@ -46,12 +46,12 @@ where F: FnOnce(&mut Evaluation), { // First step is to evaluate the Nix code ... - let mut eval = Evaluation::new(src, None); + let mut eval = Evaluation::default(); config(&mut eval); eval.strict = true; let source = eval.source_map(); - let result = eval.evaluate(); + let result = eval.evaluate(src, None); if !result.errors.is_empty() { return Err(Error::NixErrors { |