diff options
author | Florian Klink <flokli@flokli.de> | 2023-01-02T13·37+0100 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-01-03T13·03+0000 |
commit | ceb2c0ba895554c7cabb0ac20d3a80ea2aba1ab1 (patch) | |
tree | 427ee29cd8883bc1159a58e7f6e92a8d673b155e /tvix/store/src | |
parent | d0bbc8c8214fe164be572a0c2b1bd28f79fc1d20 (diff) |
chore(tvix/store): make importable r/5569
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 <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/src')
-rw-r--r-- | tvix/store/src/lib.rs | 10 | ||||
-rw-r--r-- | tvix/store/src/main.rs | 24 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tvix/store/src/lib.rs b/tvix/store/src/lib.rs new file mode 100644 index 000000000000..de1cd6557331 --- /dev/null +++ b/tvix/store/src/lib.rs @@ -0,0 +1,10 @@ +pub mod nixbase32; +pub mod nixpath; +pub mod proto; + +pub mod dummy_blob_service; +pub mod dummy_directory_service; +pub mod dummy_path_info_service; + +#[cfg(test)] +mod tests; 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<dyn std::error::Error>> { 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)) |