Use tonic-build compile_fds to build file descriptor set (#87)

andrewhickman · Sep 26, 2024 · 34c2bc8 · 34c2bc8
1 parent 2df8867
commit 34c2bc8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -37,15 +37,9 @@ Usage with [`tonic-build`](https://crates.io/crates/tonic-build):
 ```rust
 let file_descriptors = protox::compile(["root.proto"], ["."]).unwrap();
 
-let file_descriptor_path = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR not set"))
-    .join("file_descriptor_set.bin");
-fs::write(&file_descriptor_path, file_descriptors.encode_to_vec()).unwrap();
-
 tonic_build::configure()
     .build_server(true)
-    .file_descriptor_set_path(&file_descriptor_path)
-    .skip_protoc_run()
-    .compile(&["root.proto"], &["."])
+    .compile_fds(file_descriptors)
     .unwrap();
 ```
 

diff --git a/protox/Cargo.toml b/protox/Cargo.toml
@@ -59,7 +59,7 @@ serde_yaml = "0.9.34"
 similar-asserts = { version = "1.2.0" }
 tempfile = "3.10.1"
 serde_json = "1.0.117"
-tonic-build = "0.12.0"
+tonic-build = "0.12.3"
 
 [package.metadata.release]
 tag-name = "{{version}}"

diff --git a/protox/src/lib.rs b/protox/src/lib.rs
@@ -30,15 +30,9 @@
 //!
 //! let file_descriptors = protox::compile(["root.proto"], ["."]).unwrap();
 //!
-//! let file_descriptor_path = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR not set"))
-//!     .join("file_descriptor_set.bin");
-//! fs::write(&file_descriptor_path, file_descriptors.encode_to_vec()).unwrap();
-//!
 //! tonic_build::configure()
 //!     .build_server(true)
-//!     .file_descriptor_set_path(&file_descriptor_path)
-//!     .skip_protoc_run()
-//!     .compile(&["root.proto"], &["."])
+//!     .compile_fds(file_descriptors)
 //!     .unwrap();
 //! ```
 //!