about summary refs log tree commit diff
path: root/tvix/build/src/bin
diff options
context:
space:
mode:
authorYureka <tvl@yuka.dev>2024-07-18T17·09+0200
committeryuka <tvl@yuka.dev>2024-07-18T19·19+0000
commit168e4fda5909e535f33051051ef426e221ef20d4 (patch)
treee23b8ad4ced3f4232bdb0ad186f3b63f693c57e5 /tvix/build/src/bin
parent79317be214ce2f1e3347438319d3482bb773a649 (diff)
refactor(tvix): use composition & registry for from_addr r/8368
Change-Id: I3c94ecb5958294b5973c6fcdf5ee9c0d37fa54ad
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11976
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: yuka <yuka@yuka.dev>
Diffstat (limited to 'tvix/build/src/bin')
-rw-r--r--tvix/build/src/bin/tvix-build.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/tvix/build/src/bin/tvix-build.rs b/tvix/build/src/bin/tvix-build.rs
index 26f2044af3fd..7f077a88dd8f 100644
--- a/tvix/build/src/bin/tvix-build.rs
+++ b/tvix/build/src/bin/tvix-build.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use clap::Parser;
 use clap::Subcommand;
 use tokio_listener::Listener;
@@ -51,7 +49,7 @@ enum Commands {
 }
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let cli = Cli::parse();
 
     let _ = tvix_tracing::TracingBuilder::default()
@@ -69,12 +67,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             let blob_service = blobservice::from_addr(&blob_service_addr).await?;
             let directory_service = directoryservice::from_addr(&directory_service_addr).await?;
 
-            let build_service = buildservice::from_addr(
-                &build_service_addr,
-                Arc::from(blob_service),
-                Arc::from(directory_service),
-            )
-            .await?;
+            let build_service =
+                buildservice::from_addr(&build_service_addr, blob_service, directory_service)
+                    .await?;
 
             let listen_address = listen_address
                 .unwrap_or_else(|| "[::]:8000".to_string())