From ceb2c0ba895554c7cabb0ac20d3a80ea2aba1ab1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 2 Jan 2023 14:37:08 +0100 Subject: chore(tvix/store): make importable This allows other crates to import tvix_store. Rename the bin crate to tvix-store-bin, to avoid having multiple crates with the same name (https://github.com/rust-lang/cargo/issues/6313) Change-Id: I857768d6115640dbf102e79ed03e8474090df2fe Reviewed-on: https://cl.tvl.fyi/c/depot/+/7728 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/store/src/main.rs | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'tvix/store/src/main.rs') diff --git a/tvix/store/src/main.rs b/tvix/store/src/main.rs index 0ba49e3bfd4c..0ad1857db6bc 100644 --- a/tvix/store/src/main.rs +++ b/tvix/store/src/main.rs @@ -1,24 +1,14 @@ -use crate::proto::blob_service_server::BlobServiceServer; -use crate::proto::directory_service_server::DirectoryServiceServer; -use crate::proto::path_info_service_server::PathInfoServiceServer; +use tvix_store::proto::blob_service_server::BlobServiceServer; +use tvix_store::proto::directory_service_server::DirectoryServiceServer; +use tvix_store::proto::path_info_service_server::PathInfoServiceServer; #[cfg(feature = "reflection")] -use crate::proto::FILE_DESCRIPTOR_SET; +use tvix_store::proto::FILE_DESCRIPTOR_SET; use clap::Parser; use tonic::{transport::Server, Result}; use tracing::{info, Level}; -mod dummy_blob_service; -mod dummy_directory_service; -mod dummy_path_info_service; -mod nixbase32; -mod nixpath; -mod proto; - -#[cfg(test)] -mod tests; - #[derive(Parser)] #[command(author, version, about, long_about = None)] struct Cli { @@ -44,9 +34,9 @@ async fn main() -> Result<(), Box> { let mut server = Server::builder(); - let blob_service = dummy_blob_service::DummyBlobService {}; - let directory_service = dummy_directory_service::DummyDirectoryService {}; - let path_info_service = dummy_path_info_service::DummyPathInfoService {}; + let blob_service = tvix_store::dummy_blob_service::DummyBlobService {}; + let directory_service = tvix_store::dummy_directory_service::DummyDirectoryService {}; + let path_info_service = tvix_store::dummy_path_info_service::DummyPathInfoService {}; let mut router = server .add_service(BlobServiceServer::new(blob_service)) -- cgit 1.4.1