maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/glue/fetchers): use named field for structs

Browse source 
This allows giving more self-speaking names, as well as documenting each
field individually.

Change-Id: Ide164d684b7f819aac279cc8e657c02fc24d093f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11786
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2024-06-10 21:15:35 +03:00 • committed by clbot
parent a7bf5b975f
commit e1d3fa240a
3 changed files with 76 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tvix/glue/src/builtins/fetchers.rs
View file

@ -6,7 +6,6 @@ use crate::{
tvix_store_io::TvixStoreIO,
};
use nix_compat::nixhash;
use nix_compat::nixhash::NixHash;
use std::rc::Rc;
use tracing::info;
use tvix_eval::builtin_macros::builtins;
@ -80,6 +79,7 @@ async fn extract_fetch_args(
#[builtins(state = "Rc<TvixStoreIO>")]
pub(crate) mod fetcher_builtins {
use crate::builtins::FetcherError;
use nix_compat::nixhash::NixHash;
use url::Url;
use super::*;
@ -147,7 +147,10 @@ pub(crate) mod fetcher_builtins {
fetch_lazy(
state,
name,
Fetch::URL(url, args.sha256.map(NixHash::Sha256)),
Fetch::URL {
url,
exp_hash: args.sha256.map(NixHash::Sha256),
},
)
}
@ -172,7 +175,14 @@ pub(crate) mod fetcher_builtins {
let url = Url::parse(&args.url_str)
.map_err(|e| ErrorKind::TvixError(Rc::new(FetcherError::InvalidUrl(e))))?;
fetch_lazy(state, name, Fetch::Tarball(url, args.sha256))
fetch_lazy(
state,
name,
Fetch::Tarball {
url,
exp_nar_sha256: args.sha256,
},
)
}
#[builtin("fetchGit")]