cherry-pick "support faststr for protobuf" (#162)

* support faststr for protobuf * absolute path for `try_from`
cloudwego · May 22, 2023 · 814cf9d · 814cf9d
1 parent fad23f5
commit 814cf9d
Show file tree

Hide file tree

Showing 13 changed files with 163 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pilota-build/src/codegen/protobuf/mod.rs b/pilota-build/src/codegen/protobuf/mod.rs
@@ -170,7 +170,8 @@ impl ProtobufBackend {
             .and_then(|tags| tags.get::<ProstType>().copied());
         Ident::new(
             match ty.kind {
-                ty::TyKind::String | ty::TyKind::FastStr => "string",
+                ty::TyKind::String => "string",
+                ty::TyKind::FastStr => "faststr",
                 ty::TyKind::Bool => "bool",
                 ty::TyKind::BytesVec | ty::TyKind::Bytes => "bytes",
                 ty::TyKind::I32 if prost_type == Some(ProstType::SFixed32) => "sfixed32",

diff --git a/pilota-build/src/codegen/thrift/mod.rs b/pilota-build/src/codegen/thrift/mod.rs
@@ -415,7 +415,7 @@ impl CodegenBackend for ThriftBackend {
                     let err_msg_tmpl = format!("invalid enum value for {}, value: {{}}", name);
                     format! {
                         r#"let value = {read_i32};
-                        Ok(Self::try_from(value).map_err(|_|
+                        Ok(::std::convert::TryFrom::try_from(value).map_err(|err|
                             ::pilota::thrift::DecodeError::new(
                                 ::pilota::thrift::DecodeErrorKind::InvalidData,
                                 format!("{err_msg_tmpl}", value)