Merge pull request #174 from justxuewei/ga-separation

ci: Separate CI testing to Check and Build

Author: Tim-Zhang

.github/workflows/bvt.yml

@@ -1,38 +1,38 @@
 name: BVT
 on: [pull_request]
 jobs:
-  make:
-    name: Make
+  check:
+    name: Check
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Make
+      - name: Check
         run: |
           make deps
-          make
-          make -C example deps
-          make -C example
-          make -C ttrpc-codegen deps
-          make -C ttrpc-codegen
+          make check
+          make -C compiler check
+          make -C ttrpc-codegen check
 
-  clippy_check:
-    name: Clippy Check
+  make:
+    name: Build
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v3
-      - run: rustup component add clippy
-      - uses: tim-actions/clippy-check@master
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
-          name: checks-${{ matrix.os }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build
+        run: |
+          make deps
+          make
+          make -C compiler
+          make -C ttrpc-codegen
+          make -C example build-examples
 
   deny:
     runs-on: ubuntu-latest

Makefile

@@ -1,4 +1,4 @@
-all: debug check test
+all: debug test
 
 #
 # Build

compiler/Makefile

@@ -0,0 +1,31 @@
+all: debug test
+
+#
+# Build
+#
+
+.PHONY: debug
+debug:
+	cargo build --verbose --all-targets
+
+.PHONY: release
+release:
+	cargo build --release
+
+.PHONY: build
+build: debug
+
+.PHONY: test
+test:
+	cargo test --all-features --verbose
+
+.PHONY: check
+check:
+	cargo fmt --all -- --check
+	cargo clippy --all-targets --all-features -- -D warnings
+
+.PHONY: deps
+deps:
+	rustup update stable
+	rustup default stable
+	rustup component add rustfmt clippy

compiler/src/codegen.rs

@@ -271,23 +271,18 @@ impl<'a> MethodGen<'a> {
 
     fn write_client(&self, w: &mut CodeWriter) {
         let method_name = self.name();
-        match self.method_type().0 {
-            // Unary
-            MethodType::Unary => {
-                w.pub_fn(&self.unary(&method_name), |w| {
-                    w.write_line(&format!("let mut cres = {}::new();", self.output()));
-                    w.write_line(&format!(
-                        "::ttrpc::client_request!(self, ctx, req, \"{}.{}\", \"{}\", cres);",
-                        self.package_name,
-                        self.service_name,
-                        &self.proto.get_name(),
-                    ));
-                    w.write_line("Ok(cres)");
-                });
-            }
-
-            _ => {}
-        };
+        if let MethodType::Unary = self.method_type().0 {
+            w.pub_fn(&self.unary(&method_name), |w| {
+                w.write_line(&format!("let mut cres = {}::new();", self.output()));
+                w.write_line(&format!(
+                    "::ttrpc::client_request!(self, ctx, req, \"{}.{}\", \"{}\", cres);",
+                    self.package_name,
+                    self.service_name,
+                    &self.proto.get_name(),
+                ));
+                w.write_line("Ok(cres)");
+            });
+        }
     }
 
     fn write_async_client(&self, w: &mut CodeWriter) {
@@ -456,7 +451,7 @@ impl<'a> ServiceGen<'a> {
                     file.get_package().to_string(),
                     util::to_camel_case(proto.get_name()),
                     root_scope,
-                    &customize,
+                    customize,
                 )
             })
             .collect();
@@ -546,7 +541,7 @@ impl<'a> ServiceGen<'a> {
             trait_name = format!("{}: Sync", &self.service_name());
         }
 
-        w.pub_trait(&trait_name.to_owned(), |w| {
+        w.pub_trait(&trait_name, |w| {
             for method in &self.methods {
                 method.write_service(w);
             }
@@ -767,8 +762,8 @@ where
 {
     let req = CodeGeneratorRequest::parse_from_reader(&mut stdin()).unwrap();
     let result = gen(&GenRequest {
-        file_descriptors: &req.get_proto_file(),
-        files_to_generate: &req.get_file_to_generate(),
+        file_descriptors: req.get_proto_file(),
+        files_to_generate: req.get_file_to_generate(),
         parameter: req.get_parameter(),
     });
     let mut resp = CodeGeneratorResponse::new();

compiler/src/util.rs

@@ -48,7 +48,7 @@ impl<'a> Iterator for NameSpliter<'a> {
         let mut meet_lower = false;
         for i in self.pos..self.name.len() {
             let c = self.name[i];
-            if b'A' <= c && c <= b'Z' {
+            if (b'A'..=b'Z').contains(&c) {
                 if meet_lower {
                     // So it should be AaA or aaA
                     pos = i;
@@ -171,7 +171,7 @@ mod test {
         ];
 
         for (origin, exp) in cases {
-            let res = super::to_snake_case(&origin);
+            let res = super::to_snake_case(origin);
             assert_eq!(res, exp);
         }
     }
@@ -193,7 +193,7 @@ mod test {
         ];
 
         for (origin, exp) in cases {
-            let res = super::to_camel_case(&origin);
+            let res = super::to_camel_case(origin);
             assert_eq!(res, exp);
         }
     }

example/Makefile

@@ -4,6 +4,10 @@
 
 .PHONY: build
 build:
+	cargo build
+
+.PHONY: build-examples
+build-examples: build
 	cargo build --example server
 	cargo build --example client
 	cargo build --example async-server

ttrpc-codegen/Makefile

@@ -1,4 +1,4 @@
-all: debug check test
+all: debug test
 
 #
 # Build