hyperium · LucioFranco · Jul 2, 2025
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,8 @@ members = [
   "tonic-health",
   "tonic-types",
   "tonic-reflection",
+  "tonic-prost",
+  "tonic-prost-build",
   "tonic-web", # Non-published crates
   "examples",
   "codegen",

diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -10,4 +10,4 @@ prettyplease = "0.2"
 quote = "1"
 syn = "2"
 tempfile = "3.8.0"
-tonic-build = {path = "../tonic-build", default-features = false, features = ["prost", "cleanup-markdown"]}
+tonic-prost-build = {path = "../tonic-prost-build", default-features = false, features = ["cleanup-markdown"]}
diff --git a/codegen/src/main.rs b/codegen/src/main.rs
@@ -6,7 +6,7 @@ use std::{
 
 use protox::prost::Message as _;
 use quote::quote;
-use tonic_build::FileDescriptorSet;
+use tonic_prost_build::FileDescriptorSet;
 
 fn main() {
     // tonic-health
@@ -87,7 +87,7 @@ fn codegen(
 
     write_fds(&fds, &file_descriptor_set_path);
 
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .build_client(build_client)
         .build_server(build_server)
         .out_dir(&tempdir)

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -307,4 +307,4 @@ hyper-rustls = { version = "0.27.0", features = ["http2", "ring", "tls12"], opti
 tower-http = { version = "0.6", optional = true }
 
 [build-dependencies]
-tonic-build = { path = "../tonic-build", features = ["prost"] }
+tonic-prost-build = { path = "../tonic-prost-build" }
diff --git a/examples/build.rs b/examples/build.rs
@@ -1,29 +1,29 @@
 use std::{env, path::PathBuf};
 
 fn main() {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .compile_protos(&["proto/routeguide/route_guide.proto"], &["proto"])
         .unwrap();
 
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .file_descriptor_set_path(out_dir.join("helloworld_descriptor.bin"))
         .compile_protos(&["proto/helloworld/helloworld.proto"], &["proto"])
         .unwrap();
 
-    tonic_build::compile_protos("proto/echo/echo.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/echo/echo.proto").unwrap();
 
-    tonic_build::compile_protos("proto/unaryecho/echo.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/unaryecho/echo.proto").unwrap();
 
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .server_mod_attribute("attrs", "#[cfg(feature = \"server\")]")
         .server_attribute("Echo", "#[derive(PartialEq)]")
         .client_mod_attribute("attrs", "#[cfg(feature = \"client\")]")
         .client_attribute("Echo", "#[derive(PartialEq)]")
         .compile_protos(&["proto/attrs/attrs.proto"], &["proto"])
         .unwrap();
 
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .build_server(false)
         .compile_protos(
             &["proto/googleapis/google/pubsub/v1/pubsub.proto"],
@@ -35,7 +35,7 @@ fn main() {
 
     let smallbuff_copy = out_dir.join("smallbuf");
     let _ = std::fs::create_dir(smallbuff_copy.clone()); // This will panic below if the directory failed to create
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .out_dir(smallbuff_copy)
         .codec_path("crate::common::SmallBufferCodec")
         .compile_protos(&["proto/helloworld/helloworld.proto"], &["proto"])

diff --git a/interop/Cargo.toml b/interop/Cargo.toml
@@ -27,4 +27,4 @@ tower = "0.5"
 tracing-subscriber = {version = "0.3"}
 
 [build-dependencies]
-tonic-build = {path = "../tonic-build", features = ["prost"]}
+tonic-prost-build = {path = "../tonic-prost-build"}
diff --git a/interop/build.rs b/interop/build.rs
@@ -1,7 +1,7 @@
 fn main() {
     let proto = "proto/grpc/testing/test.proto";
 
-    tonic_build::compile_protos(proto).unwrap();
+    tonic_prost_build::compile_protos(proto).unwrap();
 
     // prevent needing to rebuild if files (or deps) haven't changed
     println!("cargo:rerun-if-changed={proto}");

diff --git a/tests/ambiguous_methods/Cargo.toml b/tests/ambiguous_methods/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/ambiguous_methods/build.rs b/tests/ambiguous_methods/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/ambiguous_methods.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/ambiguous_methods.proto").unwrap();
 }
diff --git a/tests/compression/Cargo.toml b/tests/compression/Cargo.toml
@@ -20,4 +20,4 @@ tower = "0.5"
 tower-http = {version = "0.6", features = ["map-response-body", "map-request-body"]}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build" }
+tonic-prost-build = {path = "../../tonic-prost-build" }
diff --git a/tests/compression/build.rs b/tests/compression/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/test.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/test.proto").unwrap();
 }
diff --git a/tests/default_stubs/Cargo.toml b/tests/default_stubs/Cargo.toml
@@ -13,4 +13,4 @@ tonic = {path = "../../tonic"}
 tempfile = "3.20"
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build" }
+tonic-prost-build = {path = "../../tonic-prost-build" }
diff --git a/tests/default_stubs/build.rs b/tests/default_stubs/build.rs
@@ -1,8 +1,8 @@
 fn main() {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .compile_protos(&["proto/test.proto"], &["proto"])
         .unwrap();
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .generate_default_stubs(true)
         .compile_protos(&["proto/test_default.proto"], &["proto"])
         .unwrap();

diff --git a/tests/deprecated_methods/Cargo.toml b/tests/deprecated_methods/Cargo.toml
@@ -8,6 +8,7 @@ license = "MIT"
 [dependencies]
 prost = "0.14"
 tonic = { path = "../../tonic" }
+tonic-prost = { path = "../../tonic-prost" }
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-prost-build = { path = "../../tonic-prost-build" }
diff --git a/tests/deprecated_methods/build.rs b/tests/deprecated_methods/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/test.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/test.proto").unwrap();
 }
diff --git a/tests/disable_comments/Cargo.toml b/tests/disable_comments/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = { path = "../../tonic" }
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-prost-build = { path = "../../tonic-prost-build" }
diff --git a/tests/disable_comments/build.rs b/tests/disable_comments/build.rs
@@ -1,7 +1,7 @@
 fn main() {
-    let mut config = tonic_build::Config::default();
+    let mut config = tonic_prost_build::Config::default();
     config.disable_comments(["test.Input1", "test.Output1"]);
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .disable_comments("test.Service1")
         .disable_comments("test.Service1.Rpc1")
         .build_client(true)

diff --git a/tests/extern_path/my_application/Cargo.toml b/tests/extern_path/my_application/Cargo.toml
@@ -12,4 +12,4 @@ tonic = {path = "../../../tonic"}
 uuid = {package = "uuid1", path = "../uuid"}
 
 [build-dependencies]
-tonic-build = {path = "../../../tonic-build"}
+tonic-prost-build = {path = "../../../tonic-prost-build"}
diff --git a/tests/extern_path/my_application/build.rs b/tests/extern_path/my_application/build.rs
@@ -1,5 +1,5 @@
 fn main() -> Result<(), std::io::Error> {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .build_server(false)
         .build_client(true)
         .extern_path(".uuid", "::uuid")

diff --git a/tests/included_service/Cargo.toml b/tests/included_service/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/included_service/build.rs b/tests/included_service/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/includer.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/includer.proto").unwrap();
 }
diff --git a/tests/integration_tests/Cargo.toml b/tests/integration_tests/Cargo.toml
@@ -11,6 +11,7 @@ bytes = "1.0"
 prost = "0.14"
 tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net", "sync"]}
 tonic = {path = "../../tonic"}
+tonic-prost = {path = "../../tonic-prost"}
 tracing-subscriber = {version = "0.3"}
 
 [dev-dependencies]
@@ -24,4 +25,4 @@ tower-http = { version = "0.6", features = ["set-header", "trace"] }
 tower-service = "0.3"
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/integration_tests/build.rs b/tests/integration_tests/build.rs
@@ -1,4 +1,4 @@
 fn main() {
-    tonic_build::compile_protos("proto/test.proto").unwrap();
-    tonic_build::compile_protos("proto/stream.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/test.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/stream.proto").unwrap();
 }
diff --git a/tests/root-crate-path/Cargo.toml b/tests/root-crate-path/Cargo.toml
@@ -9,4 +9,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/root-crate-path/build.rs b/tests/root-crate-path/build.rs
@@ -1,5 +1,5 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .extern_path(".foo.bar.baz.Animal", "crate::Animal")
         .compile_protos(&["foo.proto"], &["."])?;
 

diff --git a/tests/same_name/Cargo.toml b/tests/same_name/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/same_name/build.rs b/tests/same_name/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/foo.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/foo.proto").unwrap();
 }
diff --git a/tests/service_named_result/Cargo.toml b/tests/service_named_result/Cargo.toml
@@ -10,4 +10,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/service_named_result/build.rs b/tests/service_named_result/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/result.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/result.proto").unwrap();
 }
diff --git a/tests/service_named_service/Cargo.toml b/tests/service_named_service/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/service_named_service/build.rs b/tests/service_named_service/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/foo.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/foo.proto").unwrap();
 }
diff --git a/tests/skip_debug/Cargo.toml b/tests/skip_debug/Cargo.toml
@@ -14,4 +14,4 @@ tonic = { path = "../../tonic" }
 static_assertions = "1"
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-prost-build = { path = "../../tonic-prost-build" }
diff --git a/tests/skip_debug/build.rs b/tests/skip_debug/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .skip_debug("test.Test")
         .skip_debug("test.Output")
         .build_client(true)

diff --git a/tests/stream_conflict/Cargo.toml b/tests/stream_conflict/Cargo.toml
@@ -11,4 +11,4 @@ prost = "0.14"
 tonic = { path = "../../tonic" }
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-prost-build = { path = "../../tonic-prost-build" }
diff --git a/tests/stream_conflict/build.rs b/tests/stream_conflict/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/stream_conflict.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/stream_conflict.proto").unwrap();
 }
diff --git a/tests/use_arc_self/Cargo.toml b/tests/use_arc_self/Cargo.toml
@@ -9,4 +9,4 @@ prost = "0.14"
 tonic = {path = "../../tonic", features = ["gzip"]}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build" }
+tonic-prost-build = {path = "../../tonic-prost-build" }
diff --git a/tests/use_arc_self/build.rs b/tests/use_arc_self/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .use_arc_self(true)
         .compile_protos(&["proto/test.proto"], &["proto"])
         .unwrap();

diff --git a/tests/web/Cargo.toml b/tests/web/Cargo.toml
@@ -14,9 +14,10 @@ prost = "0.14"
 tokio = { version = "1", features = ["macros", "rt", "net"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tonic = { path = "../../tonic" }
+tonic-prost = { path = "../../tonic-prost" }
 
 [dev-dependencies]
 tonic-web = { path = "../../tonic-web" }
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-prost-build = { path = "../../tonic-prost-build" }
diff --git a/tests/web/build.rs b/tests/web/build.rs
@@ -1,7 +1,7 @@
 fn main() {
     let protos = &["proto/test.proto"];
 
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .compile_protos(protos, &["proto"])
         .unwrap();
 

diff --git a/tests/wellknown-compiled/Cargo.toml b/tests/wellknown-compiled/Cargo.toml
@@ -14,4 +14,4 @@ prost = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/wellknown-compiled/build.rs b/tests/wellknown-compiled/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .extern_path(".google.protobuf.Empty", "()")
         .compile_well_known_types(true)
         .compile_protos(&["proto/google.proto", "proto/test.proto"], &["proto"])

diff --git a/tests/wellknown/Cargo.toml b/tests/wellknown/Cargo.toml
@@ -12,4 +12,4 @@ prost-types = "0.14"
 tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = {path = "../../tonic-build"}
+tonic-prost-build = {path = "../../tonic-prost-build"}
diff --git a/tests/wellknown/build.rs b/tests/wellknown/build.rs
@@ -1,3 +1,3 @@
 fn main() {
-    tonic_build::compile_protos("proto/wellknown.proto").unwrap();
+    tonic_prost_build::compile_protos("proto/wellknown.proto").unwrap();
 }
diff --git a/tonic-build/Cargo.toml b/tonic-build/Cargo.toml
@@ -17,15 +17,11 @@ rust-version = { workspace = true }
 [dependencies]
 prettyplease = { version = "0.2" }
 proc-macro2 = "1.0"
-prost-build = { version = "0.14", optional = true }
-prost-types = { version = "0.14", optional = true }
 quote = "1.0"
 syn = "2.0"
 
 [features]
-default = ["transport", "prost"]
-prost = ["prost-build", "dep:prost-types"]
-cleanup-markdown = ["prost-build?/cleanup-markdown"]
+default = ["transport"]
 transport = []
 
 [lints]
@@ -38,8 +34,4 @@ all-features = true
 allowed_external_types = [
   # major released
   "proc_macro2::*",
-
-  # not major released
-  "prost_build::*",
-  "prost_types::*",
 ]
diff --git a/tonic-build/src/code_gen.rs b/tonic-build/src/code_gen.rs
@@ -1,3 +1,8 @@
+//! Generic code generation for gRPC services.
+//!
+//! This module provides the generic infrastructure for generating
+//! client and server code from service definitions.
+
 use std::collections::HashSet;
 
 use proc_macro2::TokenStream;

diff --git a/tonic-build/src/compile_settings.rs b/tonic-build/src/compile_settings.rs
@@ -1,14 +1,16 @@
+//! Compilation settings for code generation.
+
+/// Settings used when compiling generated code.
 #[derive(Debug, Clone)]
-pub(crate) struct CompileSettings {
-    #[cfg(feature = "prost")]
-    pub(crate) codec_path: String,
+pub struct CompileSettings {
+    /// The path to the codec to use for encoding/decoding messages.
+    pub codec_path: String,
 }
 
 impl Default for CompileSettings {
     fn default() -> Self {
         Self {
-            #[cfg(feature = "prost")]
-            codec_path: "tonic::codec::ProstCodec".to_string(),
+            codec_path: "tonic_prost::ProstCodec".to_string(),
         }
     }
 }