fix(prost-build): Make type_name_domain cumulative

tokio-rs · Jan 14, 2025 · 23ecf6d · 23ecf6d
1 parent e617832
commit 23ecf6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/prost-build/src/config.rs b/prost-build/src/config.rs
@@ -684,7 +684,6 @@ impl Config {
         S: AsRef<str>,
         D: AsRef<str>,
     {
-        self.type_name_domains.clear();
         for matcher in paths {
             self.type_name_domains
                 .insert(matcher.as_ref().to_string(), domain.as_ref().to_string());

diff --git a/tests/build.rs b/tests/build.rs
@@ -165,6 +165,7 @@ fn main() {
     prost_build::Config::new()
         .enable_type_names()
         .type_name_domain([".type_names.Foo"], "tests")
+        .type_name_domain([".type_names.Qux"], "tests-cumulative")
         .compile_protos(&[src.join("type_names.proto")], includes)
         .unwrap();
 

diff --git a/tests/src/type_names.proto b/tests/src/type_names.proto
@@ -8,4 +8,7 @@ message Foo {
 }
 
 message Baz {
-}
+}
+
+message Qux {
+}
diff --git a/tests/src/type_names.rs b/tests/src/type_names.rs
@@ -18,4 +18,9 @@ fn valid_type_names() {
     assert_eq!("type_names", Baz::PACKAGE);
     assert_eq!("type_names.Baz", Baz::full_name());
     assert_eq!("/type_names.Baz", Baz::type_url());
+
+    assert_eq!("Qux", Qux::NAME);
+    assert_eq!("type_names", Qux::PACKAGE);
+    assert_eq!("type_names.Qux", Qux::full_name());
+    assert_eq!("tests-cumulative/type_names.Qux", Qux::type_url());
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,7 @@ message Foo { @@
     }
     message Baz {
-    }
+    }
+    message Qux {
+    }