diff --git a/Cargo.lock b/Cargo.lock index 4a6534c..aa1a222 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -650,6 +650,7 @@ dependencies = [ "similar-asserts", "tempfile", "thiserror", + "tonic-prost-build", ] [[package]] @@ -976,6 +977,34 @@ dependencies = [ "syn", ] +[[package]] +name = "tonic-build" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18262cdd13dec66e8e3f2e3fe535e4b2cc706fab444a7d3678d75d8ac2557329" +dependencies = [ + "prettyplease", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tonic-prost-build" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114cca66d757d72422ef8cccf8be3065321860ac9fa4be73aab37a8a20a9a805" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "prost-types", + "quote", + "syn", + "tempfile", + "tonic-build", +] + [[package]] name = "unarray" version = "0.1.4" diff --git a/README.md b/README.md index 5e41395..5ea161b 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ let file_descriptors = protox::compile(["root.proto"], ["."]).unwrap(); prost_build::compile_fds(file_descriptors).unwrap(); ``` -Usage with [`tonic-build`](https://crates.io/crates/tonic-build): +Usage with [`tonic-prost-build`](https://crates.io/crates/tonic-prost-build): ```rust let file_descriptors = protox::compile(["root.proto"], ["."]).unwrap(); -tonic_build::configure() +tonic_prost_build::configure() .build_server(true) .compile_fds(file_descriptors) .unwrap(); @@ -96,4 +96,4 @@ dual licensed as above, without any additional terms or conditions. ## Related projects * [prost](https://crates.io/crates/prost) - a protocol buffers implementation for the Rust Language - * [protoxy](https://github.com/tardyp/protoxy) - python bindings for protox \ No newline at end of file + * [protoxy](https://github.com/tardyp/protoxy) - python bindings for protox diff --git a/protox/Cargo.toml b/protox/Cargo.toml index 064a0bf..cc3ce97 100644 --- a/protox/Cargo.toml +++ b/protox/Cargo.toml @@ -46,7 +46,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.3" +tonic-prost-build = { version = "0.14", default-features = false } [package.metadata.release] tag-name = "{{version}}" diff --git a/protox/src/lib.rs b/protox/src/lib.rs index 9d237bb..faae41f 100644 --- a/protox/src/lib.rs +++ b/protox/src/lib.rs @@ -18,9 +18,9 @@ //! prost_build::compile_fds(file_descriptors).unwrap(); //! ``` //! -//! Usage with [`tonic-build`](https://crates.io/crates/tonic-build): +//! Usage with [`tonic-prost-build`](https://crates.io/crates/tonic-prost-build): //! -//! ```rust,ignore +//! ```rust //! # use std::{env, fs, path::PathBuf}; //! # let tempdir = tempfile::TempDir::new().unwrap(); //! # env::set_current_dir(&tempdir).unwrap(); @@ -30,7 +30,7 @@ //! //! let file_descriptors = protox::compile(["root.proto"], ["."]).unwrap(); //! -//! tonic_build::configure() +//! tonic_prost_build::configure() //! .build_server(true) //! .compile_fds(file_descriptors) //! .unwrap();