diff options
| -rw-r--r-- | tvix/cli/src/main.rs | 4 | ||||
| -rw-r--r-- | tvix/glue/benches/eval.rs | 4 | ||||
| -rw-r--r-- | tvix/glue/src/builtins/import.rs | 2 | ||||
| -rw-r--r-- | tvix/glue/src/builtins/mod.rs | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index d8a51d28915c..436e895863ee 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -130,8 +130,8 @@ 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, tvix_store_io.clone()); - add_fetcher_builtins(&mut eval, tvix_store_io.clone()); + add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io)); + add_fetcher_builtins(&mut eval, Rc::clone(&tvix_store_io)); add_import_builtins(&mut eval, tvix_store_io); configure_nix_path(&mut eval, &args.nix_search_path); diff --git a/tvix/glue/benches/eval.rs b/tvix/glue/benches/eval.rs index 3e3dc533265f..dfb4fabe444a 100644 --- a/tvix/glue/benches/eval.rs +++ b/tvix/glue/benches/eval.rs @@ -46,8 +46,8 @@ fn interpret(code: &str) { ); eval.builtins.extend(impure_builtins()); - add_derivation_builtins(&mut eval, tvix_store_io.clone()); - add_fetcher_builtins(&mut eval, tvix_store_io.clone()); + add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io)); + add_fetcher_builtins(&mut eval, Rc::clone(&tvix_store_io)); add_import_builtins(&mut eval, tvix_store_io); configure_nix_path( &mut eval, diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs index 536585102d45..7e21942e9196 100644 --- a/tvix/glue/src/builtins/import.rs +++ b/tvix/glue/src/builtins/import.rs @@ -129,7 +129,7 @@ mod import_builtins { path: Value, ) -> Result<Value, ErrorKind> { let p = path.to_path()?; - let root_node = filtered_ingest(state.clone(), co, &p, Some(&filter)).await?; + let root_node = filtered_ingest(Rc::clone(&state), co, &p, Some(&filter)).await?; let name = tvix_store::import::path_to_name(&p)?; Ok(state diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs index 78e5fe87ec4c..a62ba192871f 100644 --- a/tvix/glue/src/builtins/mod.rs +++ b/tvix/glue/src/builtins/mod.rs @@ -20,7 +20,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(io)); + .extend(derivation::derivation_builtins::builtins(Rc::clone(&io))); // Add the actual `builtins.derivation` from compiled Nix code eval.src_builtins @@ -34,7 +34,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(io)); + .extend(fetchers::fetcher_builtins::builtins(Rc::clone(&io))); } /// Adds import-related builtins to the passed [tvix_eval::Evaluation]. @@ -82,8 +82,8 @@ mod tests { let mut eval = tvix_eval::Evaluation::new(io.clone() as Rc<dyn EvalIO>, false); - add_derivation_builtins(&mut eval, io.clone()); - add_fetcher_builtins(&mut eval, io.clone()); + add_derivation_builtins(&mut eval, Rc::clone(&io)); + add_fetcher_builtins(&mut eval, Rc::clone(&io)); add_import_builtins(&mut eval, io); // run the evaluation itself. |