Skip to content

Commit 24e6479

Browse files
stepanchegstepancheg
committed
Make unknown_fields field public in generated messages
1 parent fe9ca9c commit 24e6479

File tree

13 files changed

+55
-56
lines changed

13 files changed

+55
-56
lines changed

‎protobuf-codegen/src/message.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ impl<'a> MessageGen<'a> {
386386
if self.serde_derive_enabled() {
387387
w.write_line("#[serde(skip)]");
388388
}
389-
// TODO: make public
390-
w.field_decl("unknown_fields", "::protobuf::UnknownFields");
389+
w.pub_field_decl("unknown_fields", "::protobuf::UnknownFields");
391390
if self.serde_derive_enabled() {
392391
w.write_line("#[serde(skip)]");
393392
}

‎protobuf/src/descriptor.rs

+25-25
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct FileDescriptorSet {
2626
// message fields
2727
file: ::protobuf::RepeatedField<FileDescriptorProto>,
2828
// special fields
29-
unknown_fields: ::protobuf::UnknownFields,
29+
pub unknown_fields: ::protobuf::UnknownFields,
3030
cached_size: ::protobuf::CachedSize,
3131
}
3232

@@ -194,7 +194,7 @@ pub struct FileDescriptorProto {
194194
source_code_info: ::protobuf::SingularPtrField<SourceCodeInfo>,
195195
syntax: ::protobuf::SingularField<::std::string::String>,
196196
// special fields
197-
unknown_fields: ::protobuf::UnknownFields,
197+
pub unknown_fields: ::protobuf::UnknownFields,
198198
cached_size: ::protobuf::CachedSize,
199199
}
200200

@@ -892,7 +892,7 @@ pub struct DescriptorProto {
892892
reserved_range: ::protobuf::RepeatedField<DescriptorProto_ReservedRange>,
893893
reserved_name: ::protobuf::RepeatedField<::std::string::String>,
894894
// special fields
895-
unknown_fields: ::protobuf::UnknownFields,
895+
pub unknown_fields: ::protobuf::UnknownFields,
896896
cached_size: ::protobuf::CachedSize,
897897
}
898898

@@ -1486,7 +1486,7 @@ pub struct DescriptorProto_ExtensionRange {
14861486
start: ::std::option::Option<i32>,
14871487
end: ::std::option::Option<i32>,
14881488
// special fields
1489-
unknown_fields: ::protobuf::UnknownFields,
1489+
pub unknown_fields: ::protobuf::UnknownFields,
14901490
cached_size: ::protobuf::CachedSize,
14911491
}
14921492

@@ -1674,7 +1674,7 @@ pub struct DescriptorProto_ReservedRange {
16741674
start: ::std::option::Option<i32>,
16751675
end: ::std::option::Option<i32>,
16761676
// special fields
1677-
unknown_fields: ::protobuf::UnknownFields,
1677+
pub unknown_fields: ::protobuf::UnknownFields,
16781678
cached_size: ::protobuf::CachedSize,
16791679
}
16801680

@@ -1870,7 +1870,7 @@ pub struct FieldDescriptorProto {
18701870
json_name: ::protobuf::SingularField<::std::string::String>,
18711871
options: ::protobuf::SingularPtrField<FieldOptions>,
18721872
// special fields
1873-
unknown_fields: ::protobuf::UnknownFields,
1873+
pub unknown_fields: ::protobuf::UnknownFields,
18741874
cached_size: ::protobuf::CachedSize,
18751875
}
18761876

@@ -2595,7 +2595,7 @@ pub struct OneofDescriptorProto {
25952595
name: ::protobuf::SingularField<::std::string::String>,
25962596
options: ::protobuf::SingularPtrField<OneofOptions>,
25972597
// special fields
2598-
unknown_fields: ::protobuf::UnknownFields,
2598+
pub unknown_fields: ::protobuf::UnknownFields,
25992599
cached_size: ::protobuf::CachedSize,
26002600
}
26012601

@@ -2814,7 +2814,7 @@ pub struct EnumDescriptorProto {
28142814
value: ::protobuf::RepeatedField<EnumValueDescriptorProto>,
28152815
options: ::protobuf::SingularPtrField<EnumOptions>,
28162816
// special fields
2817-
unknown_fields: ::protobuf::UnknownFields,
2817+
pub unknown_fields: ::protobuf::UnknownFields,
28182818
cached_size: ::protobuf::CachedSize,
28192819
}
28202820

@@ -3081,7 +3081,7 @@ pub struct EnumValueDescriptorProto {
30813081
number: ::std::option::Option<i32>,
30823082
options: ::protobuf::SingularPtrField<EnumValueOptions>,
30833083
// special fields
3084-
unknown_fields: ::protobuf::UnknownFields,
3084+
pub unknown_fields: ::protobuf::UnknownFields,
30853085
cached_size: ::protobuf::CachedSize,
30863086
}
30873087

@@ -3339,7 +3339,7 @@ pub struct ServiceDescriptorProto {
33393339
method: ::protobuf::RepeatedField<MethodDescriptorProto>,
33403340
options: ::protobuf::SingularPtrField<ServiceOptions>,
33413341
// special fields
3342-
unknown_fields: ::protobuf::UnknownFields,
3342+
pub unknown_fields: ::protobuf::UnknownFields,
33433343
cached_size: ::protobuf::CachedSize,
33443344
}
33453345

@@ -3609,7 +3609,7 @@ pub struct MethodDescriptorProto {
36093609
client_streaming: ::std::option::Option<bool>,
36103610
server_streaming: ::std::option::Option<bool>,
36113611
// special fields
3612-
unknown_fields: ::protobuf::UnknownFields,
3612+
pub unknown_fields: ::protobuf::UnknownFields,
36133613
cached_size: ::protobuf::CachedSize,
36143614
}
36153615

@@ -4022,7 +4022,7 @@ pub struct FileOptions {
40224022
csharp_namespace: ::protobuf::SingularField<::std::string::String>,
40234023
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
40244024
// special fields
4025-
unknown_fields: ::protobuf::UnknownFields,
4025+
pub unknown_fields: ::protobuf::UnknownFields,
40264026
cached_size: ::protobuf::CachedSize,
40274027
}
40284028

@@ -4843,7 +4843,7 @@ pub struct MessageOptions {
48434843
map_entry: ::std::option::Option<bool>,
48444844
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
48454845
// special fields
4846-
unknown_fields: ::protobuf::UnknownFields,
4846+
pub unknown_fields: ::protobuf::UnknownFields,
48474847
cached_size: ::protobuf::CachedSize,
48484848
}
48494849

@@ -5162,7 +5162,7 @@ pub struct FieldOptions {
51625162
weak: ::std::option::Option<bool>,
51635163
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
51645164
// special fields
5165-
unknown_fields: ::protobuf::UnknownFields,
5165+
pub unknown_fields: ::protobuf::UnknownFields,
51665166
cached_size: ::protobuf::CachedSize,
51675167
}
51685168

@@ -5649,7 +5649,7 @@ pub struct OneofOptions {
56495649
// message fields
56505650
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
56515651
// special fields
5652-
unknown_fields: ::protobuf::UnknownFields,
5652+
pub unknown_fields: ::protobuf::UnknownFields,
56535653
cached_size: ::protobuf::CachedSize,
56545654
}
56555655

@@ -5808,7 +5808,7 @@ pub struct EnumOptions {
58085808
deprecated: ::std::option::Option<bool>,
58095809
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
58105810
// special fields
5811-
unknown_fields: ::protobuf::UnknownFields,
5811+
pub unknown_fields: ::protobuf::UnknownFields,
58125812
cached_size: ::protobuf::CachedSize,
58135813
}
58145814

@@ -6044,7 +6044,7 @@ pub struct EnumValueOptions {
60446044
deprecated: ::std::option::Option<bool>,
60456045
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
60466046
// special fields
6047-
unknown_fields: ::protobuf::UnknownFields,
6047+
pub unknown_fields: ::protobuf::UnknownFields,
60486048
cached_size: ::protobuf::CachedSize,
60496049
}
60506050

@@ -6241,7 +6241,7 @@ pub struct ServiceOptions {
62416241
deprecated: ::std::option::Option<bool>,
62426242
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
62436243
// special fields
6244-
unknown_fields: ::protobuf::UnknownFields,
6244+
pub unknown_fields: ::protobuf::UnknownFields,
62456245
cached_size: ::protobuf::CachedSize,
62466246
}
62476247

@@ -6438,7 +6438,7 @@ pub struct MethodOptions {
64386438
deprecated: ::std::option::Option<bool>,
64396439
uninterpreted_option: ::protobuf::RepeatedField<UninterpretedOption>,
64406440
// special fields
6441-
unknown_fields: ::protobuf::UnknownFields,
6441+
pub unknown_fields: ::protobuf::UnknownFields,
64426442
cached_size: ::protobuf::CachedSize,
64436443
}
64446444

@@ -6640,7 +6640,7 @@ pub struct UninterpretedOption {
66406640
string_value: ::protobuf::SingularField<::std::vec::Vec<u8>>,
66416641
aggregate_value: ::protobuf::SingularField<::std::string::String>,
66426642
// special fields
6643-
unknown_fields: ::protobuf::UnknownFields,
6643+
pub unknown_fields: ::protobuf::UnknownFields,
66446644
cached_size: ::protobuf::CachedSize,
66456645
}
66466646

@@ -7071,7 +7071,7 @@ pub struct UninterpretedOption_NamePart {
70717071
name_part: ::protobuf::SingularField<::std::string::String>,
70727072
is_extension: ::std::option::Option<bool>,
70737073
// special fields
7074-
unknown_fields: ::protobuf::UnknownFields,
7074+
pub unknown_fields: ::protobuf::UnknownFields,
70757075
cached_size: ::protobuf::CachedSize,
70767076
}
70777077

@@ -7277,7 +7277,7 @@ pub struct SourceCodeInfo {
72777277
// message fields
72787278
location: ::protobuf::RepeatedField<SourceCodeInfo_Location>,
72797279
// special fields
7280-
unknown_fields: ::protobuf::UnknownFields,
7280+
pub unknown_fields: ::protobuf::UnknownFields,
72817281
cached_size: ::protobuf::CachedSize,
72827282
}
72837283

@@ -7438,7 +7438,7 @@ pub struct SourceCodeInfo_Location {
74387438
trailing_comments: ::protobuf::SingularField<::std::string::String>,
74397439
leading_detached_comments: ::protobuf::RepeatedField<::std::string::String>,
74407440
// special fields
7441-
unknown_fields: ::protobuf::UnknownFields,
7441+
pub unknown_fields: ::protobuf::UnknownFields,
74427442
cached_size: ::protobuf::CachedSize,
74437443
}
74447444

@@ -7781,7 +7781,7 @@ pub struct GeneratedCodeInfo {
77817781
// message fields
77827782
annotation: ::protobuf::RepeatedField<GeneratedCodeInfo_Annotation>,
77837783
// special fields
7784-
unknown_fields: ::protobuf::UnknownFields,
7784+
pub unknown_fields: ::protobuf::UnknownFields,
77857785
cached_size: ::protobuf::CachedSize,
77867786
}
77877787

@@ -7941,7 +7941,7 @@ pub struct GeneratedCodeInfo_Annotation {
79417941
begin: ::std::option::Option<i32>,
79427942
end: ::std::option::Option<i32>,
79437943
// special fields
7944-
unknown_fields: ::protobuf::UnknownFields,
7944+
pub unknown_fields: ::protobuf::UnknownFields,
79457945
cached_size: ::protobuf::CachedSize,
79467946
}
79477947

‎protobuf/src/plugin.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub struct CodeGeneratorRequest {
2828
parameter: ::protobuf::SingularField<::std::string::String>,
2929
proto_file: ::protobuf::RepeatedField<::protobuf::descriptor::FileDescriptorProto>,
3030
// special fields
31-
unknown_fields: ::protobuf::UnknownFields,
31+
pub unknown_fields: ::protobuf::UnknownFields,
3232
cached_size: ::protobuf::CachedSize,
3333
}
3434

@@ -278,7 +278,7 @@ pub struct CodeGeneratorResponse {
278278
error: ::protobuf::SingularField<::std::string::String>,
279279
file: ::protobuf::RepeatedField<CodeGeneratorResponse_File>,
280280
// special fields
281-
unknown_fields: ::protobuf::UnknownFields,
281+
pub unknown_fields: ::protobuf::UnknownFields,
282282
cached_size: ::protobuf::CachedSize,
283283
}
284284

@@ -489,7 +489,7 @@ pub struct CodeGeneratorResponse_File {
489489
insertion_point: ::protobuf::SingularField<::std::string::String>,
490490
content: ::protobuf::SingularField<::std::string::String>,
491491
// special fields
492-
unknown_fields: ::protobuf::UnknownFields,
492+
pub unknown_fields: ::protobuf::UnknownFields,
493493
cached_size: ::protobuf::CachedSize,
494494
}
495495

‎protobuf/src/well_known_types/any.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Any {
2727
pub type_url: ::std::string::String,
2828
pub value: ::std::vec::Vec<u8>,
2929
// special fields
30-
unknown_fields: ::protobuf::UnknownFields,
30+
pub unknown_fields: ::protobuf::UnknownFields,
3131
cached_size: ::protobuf::CachedSize,
3232
}
3333

‎protobuf/src/well_known_types/api.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub struct Api {
3232
pub mixins: ::protobuf::RepeatedField<Mixin>,
3333
pub syntax: ::protobuf::well_known_types::Syntax,
3434
// special fields
35-
unknown_fields: ::protobuf::UnknownFields,
35+
pub unknown_fields: ::protobuf::UnknownFields,
3636
cached_size: ::protobuf::CachedSize,
3737
}
3838

@@ -459,7 +459,7 @@ pub struct Method {
459459
pub options: ::protobuf::RepeatedField<::protobuf::well_known_types::Option>,
460460
pub syntax: ::protobuf::well_known_types::Syntax,
461461
// special fields
462-
unknown_fields: ::protobuf::UnknownFields,
462+
pub unknown_fields: ::protobuf::UnknownFields,
463463
cached_size: ::protobuf::CachedSize,
464464
}
465465

@@ -838,7 +838,7 @@ pub struct Mixin {
838838
pub name: ::std::string::String,
839839
pub root: ::std::string::String,
840840
// special fields
841-
unknown_fields: ::protobuf::UnknownFields,
841+
pub unknown_fields: ::protobuf::UnknownFields,
842842
cached_size: ::protobuf::CachedSize,
843843
}
844844

‎protobuf/src/well_known_types/duration.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Duration {
2727
pub seconds: i64,
2828
pub nanos: i32,
2929
// special fields
30-
unknown_fields: ::protobuf::UnknownFields,
30+
pub unknown_fields: ::protobuf::UnknownFields,
3131
cached_size: ::protobuf::CachedSize,
3232
}
3333

‎protobuf/src/well_known_types/empty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
2424
#[derive(PartialEq,Clone,Default)]
2525
pub struct Empty {
2626
// special fields
27-
unknown_fields: ::protobuf::UnknownFields,
27+
pub unknown_fields: ::protobuf::UnknownFields,
2828
cached_size: ::protobuf::CachedSize,
2929
}
3030

‎protobuf/src/well_known_types/field_mask.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct FieldMask {
2626
// message fields
2727
pub paths: ::protobuf::RepeatedField<::std::string::String>,
2828
// special fields
29-
unknown_fields: ::protobuf::UnknownFields,
29+
pub unknown_fields: ::protobuf::UnknownFields,
3030
cached_size: ::protobuf::CachedSize,
3131
}
3232

‎protobuf/src/well_known_types/source_context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct SourceContext {
2626
// message fields
2727
pub file_name: ::std::string::String,
2828
// special fields
29-
unknown_fields: ::protobuf::UnknownFields,
29+
pub unknown_fields: ::protobuf::UnknownFields,
3030
cached_size: ::protobuf::CachedSize,
3131
}
3232

‎protobuf/src/well_known_types/struct_pb.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct Struct {
2626
// message fields
2727
pub fields: ::std::collections::HashMap<::std::string::String, Value>,
2828
// special fields
29-
unknown_fields: ::protobuf::UnknownFields,
29+
pub unknown_fields: ::protobuf::UnknownFields,
3030
cached_size: ::protobuf::CachedSize,
3131
}
3232

@@ -171,7 +171,7 @@ pub struct Value {
171171
// message oneof groups
172172
pub kind: ::std::option::Option<Value_oneof_kind>,
173173
// special fields
174-
unknown_fields: ::protobuf::UnknownFields,
174+
pub unknown_fields: ::protobuf::UnknownFields,
175175
cached_size: ::protobuf::CachedSize,
176176
}
177177

@@ -655,7 +655,7 @@ pub struct ListValue {
655655
// message fields
656656
pub values: ::protobuf::RepeatedField<Value>,
657657
// special fields
658-
unknown_fields: ::protobuf::UnknownFields,
658+
pub unknown_fields: ::protobuf::UnknownFields,
659659
cached_size: ::protobuf::CachedSize,
660660
}
661661

‎protobuf/src/well_known_types/timestamp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Timestamp {
2727
pub seconds: i64,
2828
pub nanos: i32,
2929
// special fields
30-
unknown_fields: ::protobuf::UnknownFields,
30+
pub unknown_fields: ::protobuf::UnknownFields,
3131
cached_size: ::protobuf::CachedSize,
3232
}
3333

0 commit comments

Comments
 (0)