ttrpc-codegen: upgrade protobuf from 2.x to 3.x

Upgrade ttrpc-codegen's dep protobuf from 2.x to 3.x

Signed-off-by: Tim Zhang <[email protected]>

Author: Tim-Zhang

ttrpc-codegen/Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 
 
 [dependencies]
-protobuf = { version = "2.14.0" }
-protobuf-codegen-pure = "2.14.0"
-protobuf-codegen = "2.14.0"
-ttrpc-compiler = "0.6.0"
+protobuf-support = "3.1.0"
+protobuf = { version = "2.27.1" }
+protobuf-codegen = "3.1.0"
+ttrpc-compiler = {path = "../compiler"}

ttrpc-codegen/src/lib.rs

@@ -1,26 +1,27 @@
 //! API to generate .rs files for ttrpc from protobuf
 //!
 //!
-//!```
-//!use ttrpc_codegen::Codegen;
-//!use ttrpc_codegen::Customize;
+//!```no_run
+//!use ttrpc_codegen::{Customize, Codegen, ProtobufCustomize};
 //!# use std::path::Path;
 //!
 //!fn main() {
 //!#   let protos: Vec<&Path> = vec![];
+//!    let protobuf_customized = ProtobufCustomize::default().gen_mod_rs(false);
+//!
 //!    Codegen::new()
-//!        .out_dir("protocols/sync")
+//!        .out_dir("protocols/asynchronous")
 //!        .inputs(&protos)
 //!        .include("protocols/protos")
 //!        .rust_protobuf()
 //!        .customize(Customize {
+//!            async_all: true,
 //!            ..Default::default()
 //!        })
+//!        .rust_protobuf_customize(protobuf_customized.clone())
 //!        .run()
-//!        .expect("Gen code failed.");
-//!}
-//!
-//!```
+//!        .expect("Gen async code failed.");
+//! }
 
 pub use protobuf_codegen::Customize as ProtobufCustomize;
 use std::collections::HashMap;
@@ -121,7 +122,8 @@ impl Codegen {
         let p = parse_and_typecheck(&includes, &inputs)?;
 
         if self.rust_protobuf {
-            protobuf_codegen_pure::Codegen::new()
+            protobuf_codegen::Codegen::new()
+                .pure()
                 .out_dir(&self.out_dir)
                 .inputs(&self.inputs)
                 .includes(&self.includes)

ttrpc-codegen/src/model.rs

@@ -5,7 +5,7 @@
 
 use crate::parser::{Loc, Parser, ParserErrorWithLocation};
 use crate::str_lit::StrLit;
-use protobuf_codegen::float;
+use protobuf_support::lexer::float;
 
 /// Protobox syntax
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]

ttrpc-codegen/src/parser.rs

@@ -5,7 +5,7 @@ use std::str;
 
 use crate::model::*;
 use crate::str_lit::*;
-use protobuf_codegen::float;
+use protobuf_support::lexer::float;
 
 const FIRST_LINE: u32 = 1;
 const FIRST_COL: u32 = 1;
@@ -735,11 +735,15 @@ impl MessageBodyParseMode {
                 | MessageBodyParseMode::ExtendProto3 => true,
                 MessageBodyParseMode::Oneof => false,
             },
-            Rule::Optional | Rule::Required => match *self {
+            Rule::Optional => match *self {
                 MessageBodyParseMode::MessageProto2 | MessageBodyParseMode::ExtendProto2 => true,
-                MessageBodyParseMode::MessageProto3
-                | MessageBodyParseMode::ExtendProto3
-                | MessageBodyParseMode::Oneof => false,
+                MessageBodyParseMode::MessageProto3 | MessageBodyParseMode::ExtendProto3 => true,
+                MessageBodyParseMode::Oneof => false,
+            },
+            Rule::Required => match *self {
+                MessageBodyParseMode::MessageProto2 | MessageBodyParseMode::ExtendProto2 => true,
+                MessageBodyParseMode::MessageProto3 | MessageBodyParseMode::ExtendProto3 => false,
+                MessageBodyParseMode::Oneof => false,
             },
         }
     }
@@ -1974,7 +1978,7 @@ mod test {
         let mess = parse(msg, |p| p.next_field(MessageBodyParseMode::MessageProto2));
         assert_eq!("f", mess.name);
         assert_eq!("default", mess.options[0].name);
-        assert_eq!("10.0", mess.options[0].value.format());
+        assert_eq!("10", mess.options[0].value.format());
     }
 
     #[test]