Skip to content

Commit c4a8f64

Browse files
FoyonaCZYGgiggle
authored andcommitted
refactor: consolidate proto service generation into a single proto_gen entry
1 parent d205115 commit c4a8f64

2 files changed

Lines changed: 5 additions & 19 deletions

File tree

tests/code-generation/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
mod r#gen {
22
include!(concat!(env!("OUT_DIR"), "/thrift_gen.rs"));
3-
include!(concat!(env!("OUT_DIR"), "/proto_service_a_gen.rs"));
4-
include!(concat!(env!("OUT_DIR"), "/proto_service_b_gen.rs"));
5-
include!(concat!(env!("OUT_DIR"), "/proto_service_c_gen.rs"));
3+
include!(concat!(env!("OUT_DIR"), "/proto_gen.rs"));
64
include!(concat!(env!("OUT_DIR"), "/descriptor_gen.rs"));
75
}
86

97
pub use descriptor_gen::descriptor;
108
pub use r#gen::*;
11-
pub use proto_service_a_gen::*;
12-
pub use proto_service_b_gen::*;
13-
pub use proto_service_c_gen::*;
9+
pub use proto_gen::*;
1410

1511
#[cfg(test)]
1612
mod tests {

tests/code-generation/volo.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Please refer to https://www.cloudwego.io/docs/volo/guide/config/ for the configuration file format.
22
entries:
33
# Protobuf entries for testing
4-
proto_service_a:
5-
filename: proto_service_a_gen.rs
4+
proto_gen:
5+
filename: proto_gen.rs
66
protocol: protobuf
77
split_generated_files: true
88
with_descriptor: true
@@ -12,30 +12,20 @@ entries:
1212
path: proto/service_a.proto
1313
includes:
1414
- proto
15-
16-
proto_service_b:
17-
filename: proto_service_b_gen.rs
18-
protocol: protobuf
19-
services:
2015
- idl:
2116
source: local
2217
path: proto/service_b.proto
2318
includes:
2419
- proto
2520
codegen_option:
2621
keep_unknown_fields: true
27-
28-
proto_service_c:
29-
filename: proto_service_c_gen.rs
30-
protocol: protobuf
31-
services:
3222
- idl:
3323
source: local
3424
path: proto/service_c.proto
3525
includes:
3626
- proto
3727

38-
proto:
28+
descriptor_gen:
3929
filename: descriptor_gen.rs
4030
protocol: protobuf
4131
touch_all: true

0 commit comments

Comments
 (0)