diff options
author | Florian Klink <flokli@flokli.de> | 2023-07-29T22·38+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-07-31T21·50+0000 |
commit | 737a6ca01e3ee017834fd310cb942079b5d10446 (patch) | |
tree | 6e90ca43d734ac567b06c62ffdcd449632df3468 /tvix/cli/src/derivation.rs | |
parent | aa1982c0852de539eeddd742f7c41bd1a873a53c (diff) |
refactor(tvix/cli/refscan): use wu-manber crate with &[u8] support r/6453
PR'ed at https://github.com/tvlfyi/wu-manber/pull/1, and now merged. Change-Id: I8c71e359196396a1d42a3ea2ab7ac15b137b2db0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8992 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/cli/src/derivation.rs')
-rw-r--r-- | tvix/cli/src/derivation.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tvix/cli/src/derivation.rs b/tvix/cli/src/derivation.rs index f8afe1946110..6cde7a366c2b 100644 --- a/tvix/cli/src/derivation.rs +++ b/tvix/cli/src/derivation.rs @@ -311,9 +311,9 @@ mod derivation_builtins { Default::default() } else { let mut refscan = state.reference_scanner(); - drv.arguments.iter().for_each(|s| refscan.scan_str(s)); - drv.environment.values().for_each(|s| refscan.scan_bytes(s)); - refscan.scan_str(&drv.builder); + drv.arguments.iter().for_each(|s| refscan.scan(s)); + drv.environment.values().for_each(|s| refscan.scan(s)); + refscan.scan(&drv.builder); refscan.finalise() } }; @@ -400,7 +400,7 @@ mod derivation_builtins { .context("evaluating the `content` parameter of builtins.toFile")?; let mut refscan = state.borrow().reference_scanner(); - refscan.scan_str(content.as_str()); + refscan.scan(content.as_str()); let refs = { let paths = state.borrow(); refscan |