include group oneof variants in generated output

stepancheg · Oct 3, 2024 · 7919ee0 · 7919ee0
1 parent c44f053
commit 7919ee0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/protobuf-codegen/src/gen/message.rs b/protobuf-codegen/src/gen/message.rs
@@ -195,7 +195,7 @@ impl<'a> MessageGen<'a> {
         F: Fn(&mut CodeWriter, &OneofVariantGen, &RustValueTyped),
     {
         for oneof in self.oneofs() {
-            let variants = oneof.variants_except_group();
+            let variants = oneof.variants();
             if variants.is_empty() {
                 // Special case because
                 // https://github.com/rust-lang/rust/issues/50642

diff --git a/protobuf-codegen/src/gen/oneof.rs b/protobuf-codegen/src/gen/oneof.rs
@@ -223,17 +223,21 @@ impl<'a> OneofGen<'a> {
             .collect()
     }
 
-    pub fn variants(&'a self) -> impl Iterator<Item = OneofVariantGen<'a>> {
-        self.oneof.variants().into_iter().map(|v| {
-            let field = self
-                .message
-                .fields
-                .iter()
-                .filter(|f| f.proto_field.name() == v.field.name())
-                .next()
-                .expect(&format!("field not found by name: {}", v.field.name()));
-            OneofVariantGen::parse(self, v, field, self.message.root_scope)
-        })
+    pub fn variants(&'a self) -> Vec<OneofVariantGen<'a>> {
+        self.oneof
+            .variants()
+            .into_iter()
+            .map(|v| {
+                let field = self
+                    .message
+                    .fields
+                    .iter()
+                    .filter(|f| f.proto_field.name() == v.field.name())
+                    .next()
+                    .expect(&format!("field not found by name: {}", v.field.name()));
+                OneofVariantGen::parse(self, v, field, self.message.root_scope)
+            })
+            .collect()
     }
 
     pub fn full_storage_type(&self) -> RustType {