feat(generator/rust): use F32 formatter

Author: coryan

generator/internal/rust/annotate_test.go

@@ -473,7 +473,7 @@ func TestOneOfAnnotations(t *testing.T) {
 		BranchName:         "OneofFieldMap",
 		FQMessageName:      "crate::model::Message",
 		DocLines:           nil,
-		Attributes:         []string{`#[serde_as(as = "std::collections::HashMap<_, wkt::internal::F32>")]`},
+		Attributes:         []string{`#[serde_as(as = "std::collections::HashMap<wkt::internal::I32, wkt::internal::F32>")]`},
 		FieldType:          "std::collections::HashMap<i32,f32>",
 		PrimitiveFieldType: "std::collections::HashMap<i32,f32>",
 		AddQueryParameter:  `let builder = req.oneof_field_map().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "oneofFieldMap") });`,
@@ -818,6 +818,7 @@ func TestJsonNameAnnotations(t *testing.T) {
 		DocLines:      nil,
 		Attributes: []string{
 			`#[serde(skip_serializing_if = "wkt::internal::is_default")]`,
+			`#[serde_as(as = "wkt::internal::I32")]`,
 		},
 		FieldType:          "i32",
 		PrimitiveFieldType: "i32",
@@ -836,6 +837,7 @@ func TestJsonNameAnnotations(t *testing.T) {
 		DocLines:      nil,
 		Attributes: []string{
 			`#[serde(skip_serializing_if = "std::option::Option::is_none")]`,
+			`#[serde_as(as = "std::option::Option<wkt::internal::I32>")]`,
 		},
 		FieldType:          "std::option::Option<i32>",
 		PrimitiveFieldType: "i32",
@@ -854,6 +856,7 @@ func TestJsonNameAnnotations(t *testing.T) {
 		DocLines:      nil,
 		Attributes: []string{
 			`#[serde(skip_serializing_if = "std::vec::Vec::is_empty")]`,
+			`#[serde_as(as = "std::vec::Vec<wkt::internal::I32>")]`,
 		},
 		FieldType:          "std::vec::Vec<i32>",
 		PrimitiveFieldType: "i32",
@@ -1046,7 +1049,7 @@ func TestFieldAnnotations(t *testing.T) {
 		FQMessageName: "crate::model::TestMessage",
 		Attributes: []string{
 			`#[serde(skip_serializing_if = "std::collections::HashMap::is_empty")]`,
-			`#[serde_as(as = "std::collections::HashMap<_, serde_with::DisplayFromStr>")]`,
+			`#[serde_as(as = "std::collections::HashMap<wkt::internal::I32, serde_with::DisplayFromStr>")]`,
 		},
 		FieldType:          "std::collections::HashMap<i32,i64>",
 		PrimitiveFieldType: "std::collections::HashMap<i32,i64>",

generator/internal/rust/codec.go

@@ -411,6 +411,8 @@ func fieldFormatter(typez api.Typez) string {
 		api.SFIXED64_TYPE,
 		api.SINT64_TYPE:
 		return "serde_with::DisplayFromStr"
+	case api.INT32_TYPE, api.SINT32_TYPE, api.SFIXED32_TYPE:
+		return "wkt::internal::I32"
 	case api.FLOAT_TYPE:
 		return "wkt::internal::F32"
 	case api.DOUBLE_TYPE:
@@ -476,6 +478,10 @@ func wrapperFieldAttributes(f *api.Field, attributes []string) []string {
 		formatter = fieldFormatter(api.UINT64_TYPE)
 	case ".google.protobuf.Int64Value":
 		formatter = fieldFormatter(api.INT64_TYPE)
+	case ".google.protobuf.UInt32Value":
+		formatter = fieldFormatter(api.UINT32_TYPE)
+	case ".google.protobuf.Int32Value":
+		formatter = fieldFormatter(api.INT32_TYPE)
 	case ".google.protobuf.FloatValue":
 		formatter = fieldFormatter(api.FLOAT_TYPE)
 	case ".google.protobuf.DoubleValue":
@@ -524,18 +530,18 @@ func fieldAttributes(f *api.Field, state *api.APIState) []string {
 	}
 	attributes := fieldBaseAttributes(f)
 	switch f.Typez {
-	case api.INT32_TYPE,
-		api.FIXED32_TYPE,
+	case api.FIXED32_TYPE,
 		api.BOOL_TYPE,
 		api.STRING_TYPE,
 		api.UINT32_TYPE,
-		api.SFIXED32_TYPE,
-		api.SINT32_TYPE,
 		api.ENUM_TYPE,
 		api.GROUP_TYPE:
 		return append(attributes, fieldSkipAttributes(f)...)
 
-	case api.INT64_TYPE,
+	case api.INT32_TYPE,
+		api.SFIXED32_TYPE,
+		api.SINT32_TYPE,
+		api.INT64_TYPE,
 		api.UINT64_TYPE,
 		api.FIXED64_TYPE,
 		api.SFIXED64_TYPE,