Merge pull request tafia#188 from yzsolt/ignore-deprecated-oneof-fields

Ignore deprecated OneOf fields in the enum definition too
sigp · Mar 16, 2021 · f87b5eb · f87b5eb
2 parents 87878e3 + 338e642
commit f87b5eb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pb-rs/src/types.rs b/pb-rs/src/types.rs
@@ -1571,7 +1571,7 @@ impl OneOf {
         } else {
             writeln!(w, "pub enum OneOf{} {{", self.name)?;
         }
-        for f in &self.fields {
+        for f in self.fields.iter().filter(|f| !f.deprecated) {
             let rust_type = f.typ.rust_type(desc)?;
             if f.boxed {
                 writeln!(w, "    {}(Box<{}>),", f.name, rust_type)?;
@@ -1596,7 +1596,7 @@ impl OneOf {
     ) -> Result<()> {
         // For the first of each enumeration type, generate an impl From<> for it.
         let mut handled_fields = Vec::new();
-        for f in &self.fields {
+        for f in self.fields.iter().filter(|f| !f.deprecated) {
             let rust_type = f.typ.rust_type(desc)?;
             if handled_fields.contains(&rust_type) {
                 continue;