mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): don't use Rc::clone explicitly

Browse source 
All these functions have an Rc of Rc<TvixStoreIO> or Rc<dyn StoreIO>, so
we can call io.clone() directly.

Change-Id: I96a5bcb9af4aca93892cb72bcfaf14540da52381
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10989
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2024-02-20 17:35:07 +07:00 committed by flokli
parent d0d1027a85
commit d9565a4d0a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/cli/src/main.rs
View file

@ -129,7 +129,7 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b
);
eval.strict = args.strict;
eval.builtins.extend(impure_builtins());
add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io));
add_derivation_builtins(&mut eval, tvix_store_io.clone());
add_fetcher_builtins(&mut eval, tvix_store_io);
configure_nix_path(&mut eval, &args.nix_search_path);

2
tvix/glue/benches/eval.rs
View file

@ -46,7 +46,7 @@ fn interpret(code: &str) {
);
eval.builtins.extend(impure_builtins());
add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io));
add_derivation_builtins(&mut eval, tvix_store_io.clone());
add_fetcher_builtins(&mut eval, tvix_store_io);
configure_nix_path(
&mut eval,

6
tvix/glue/src/builtins/mod.rs
View file

@ -18,7 +18,7 @@ pub use derivation_error::Error as DerivationError;
/// `known_paths`.
pub fn add_derivation_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<TvixStoreIO>) {
eval.builtins
.extend(derivation::derivation_builtins::builtins(Rc::clone(&io)));
.extend(derivation::derivation_builtins::builtins(io));
// Add the actual `builtins.derivation` from compiled Nix code
eval.src_builtins
@ -32,7 +32,7 @@ pub fn add_derivation_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<
/// * `fetchGit`
pub fn add_fetcher_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<TvixStoreIO>) {
eval.builtins
.extend(fetchers::fetcher_builtins::builtins(Rc::clone(&io)));
.extend(fetchers::fetcher_builtins::builtins(io));
}
#[cfg(test)]
@ -68,7 +68,7 @@ mod tests {
let mut eval = tvix_eval::Evaluation::new(io.clone() as Rc<dyn EvalIO>, false);
add_derivation_builtins(&mut eval, Rc::clone(&io));
add_derivation_builtins(&mut eval, io.clone());
add_fetcher_builtins(&mut eval, io);
// run the evaluation itself.