Skip to content

Commit a2e8f57

Browse files
authored
fix(prost-build): Make type_name_domain cumulative (#1228)
1 parent 7c16959 commit a2e8f57

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

prost-build/src/config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ impl Config {
685685
S: AsRef<str>,
686686
D: AsRef<str>,
687687
{
688-
self.type_name_domains.clear();
689688
for matcher in paths {
690689
self.type_name_domains
691690
.insert(matcher.as_ref().to_string(), domain.as_ref().to_string());

tests/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ fn main() {
165165
prost_build::Config::new()
166166
.enable_type_names()
167167
.type_name_domain([".type_names.Foo"], "tests")
168+
.type_name_domain([".type_names.Qux"], "tests-cumulative")
168169
.compile_protos(&[src.join("type_names.proto")], includes)
169170
.unwrap();
170171

tests/src/type_names.proto

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ message Foo {
88
}
99

1010
message Baz {
11-
}
11+
}
12+
13+
message Qux {
14+
}

tests/src/type_names.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@ fn valid_type_names() {
1818
assert_eq!("type_names", Baz::PACKAGE);
1919
assert_eq!("type_names.Baz", Baz::full_name());
2020
assert_eq!("/type_names.Baz", Baz::type_url());
21+
22+
assert_eq!("Qux", Qux::NAME);
23+
assert_eq!("type_names", Qux::PACKAGE);
24+
assert_eq!("type_names.Qux", Qux::full_name());
25+
assert_eq!("tests-cumulative/type_names.Qux", Qux::type_url());
2126
}

0 commit comments

Comments
 (0)