From: Linus Heckemann <git@sphalerite•org>
To: depot@tvl.su
Cc: Linus Heckemann <git@sphalerite•org>
Subject: [PATCH] fix(tvix/cli): fix refscan when no paths are referenced
Date: Thu, 1 Jun 2023 21:22:36 +0200 [thread overview]
Message-ID: <20230601192235.1159270-1-git@sphalerite.org> (raw)
Before, the construction of a TwoByteWM would panic when no patterns
were provided, as in `tvix --expr 'builtins.toFile "snens" "soos"'`.
---
tvix/cli/src/refscan.rs | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/tvix/cli/src/refscan.rs b/tvix/cli/src/refscan.rs
index 567a677ce..739cf77ed 100644
--- a/tvix/cli/src/refscan.rs
+++ b/tvix/cli/src/refscan.rs
@@ -16,7 +16,7 @@ pub const STORE_PATH_LEN: usize = "/nix/store/00000000000000000000000000000000".
/// of store paths to scan for.
pub struct ReferenceScanner<P: Ord + AsRef<[u8]>> {
candidates: Vec<P>,
- searcher: TwoByteWM,
+ searcher: Option<TwoByteWM>,
matches: Vec<usize>,
}
@@ -24,7 +24,11 @@ impl<P: Clone + Ord + AsRef<[u8]>> ReferenceScanner<P> {
/// Construct a new `ReferenceScanner` that knows how to scan for the given
/// candidate store paths.
pub fn new(candidates: Vec<P>) -> Self {
- let searcher = TwoByteWM::new(&candidates);
+ let searcher = if candidates.is_empty() {
+ None
+ } else {
+ Some(TwoByteWM::new(&candidates))
+ };
ReferenceScanner {
searcher,
@@ -40,8 +44,10 @@ impl<P: Clone + Ord + AsRef<[u8]>> ReferenceScanner<P> {
return;
}
- for m in self.searcher.find(&haystack) {
- self.matches.push(m.pat_idx);
+ if let Some(searcher) = &self.searcher {
+ for m in searcher.find(&haystack) {
+ self.matches.push(m.pat_idx);
+ }
}
}
@@ -61,6 +67,17 @@ mod tests {
// The actual derivation of `nixpkgs.hello`.
const HELLO_DRV: &'static str = r#"Derive([("out","/nix/store/33l4p0pn0mybmqzaxfkpppyh7vx1c74p-hello-2.12.1","","")],[("/nix/store/6z1jfnqqgyqr221zgbpm30v91yfj3r45-bash-5.1-p16.drv",["out"]),("/nix/store/ap9g09fxbicj836zm88d56dn3ff4clxl-stdenv-linux.drv",["out"]),("/nix/store/pf80kikyxr63wrw56k00i1kw6ba76qik-hello-2.12.1.tar.gz.drv",["out"])],["/nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25b-default-builder.sh"],"x86_64-linux","/nix/store/4xw8n979xpivdc46a9ndcvyhwgif00hz-bash-5.1-p16/bin/bash",["-e","/nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25b-default-builder.sh"],[("buildInputs",""),("builder","/nix/store/4xw8n979xpivdc46a9ndcvyhwgif00hz-bash-5.1-p16/bin/bash"),("cmakeFlags",""),("configureFlags",""),("depsBuildBuild",""),("depsBuildBuildPropagated",""),("depsBuildTarget",""),("depsBuildTargetPropagated",""),("depsHostHost",""),("depsHostHostPropagated",""),("depsTargetTarget",""),("depsTargetTargetPropagated",""),("doCheck","1"),("doInstallCheck",""),("mesonFlags",""),("name","hello-2.12.1"),("nativeBuildInputs",""),("out","/nix/store/33l4p0pn0mybmqzaxfkpppyh7vx1c74p-hello-2.12.1"),("outputs","out"),("patches",""),("pname","hello"),("propagatedBuildInputs",""),("propagatedNativeBuildInputs",""),("src","/nix/store/pa10z4ngm0g83kx9mssrqzz30s84vq7k-hello-2.12.1.tar.gz"),("stdenv","/nix/store/cp65c8nk29qq5cl1wyy5qyw103cwmax7-stdenv-linux"),("strictDeps",""),("system","x86_64-linux"),("version","2.12.1")])"#;
+ #[test]
+ fn test_no_patterns() {
+ let mut scanner: ReferenceScanner<String> = ReferenceScanner::new(vec![]);
+
+ scanner.scan_str(HELLO_DRV);
+
+ let result = scanner.finalise();
+
+ assert_eq!(result.len(), 0);
+ }
+
#[test]
fn test_single_match() {
let mut scanner = ReferenceScanner::new(vec![
--
2.40.1
next reply other threads:[~2023-06-01 19:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 19:22 Linus Heckemann [this message]
2023-06-02 13:07 ` Vincent Ambo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230601192235.1159270-1-git@sphalerite.org \
--to=git@sphalerite$(echo .)org \
--cc=depot@tvl.su \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://code.tvl.fyi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).