Commit cd7bca95 authored by Clara Engler's avatar Clara Engler
Browse files

Merge branch 'derive-depr' into 'main' 

tor-netdoc: derives: allow handling deprecated fields

See merge request !4118
parents 15cf78fe 49767b13

crates/tor-netdoc/src/derive_common.rs

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ define_derive_deftly! { 
        $/// optional fields all get the default values.

        $tvis fn construct(self) -> $ttype {

            $tname { $(

                #[allow(deprecated)]

                $fname: ${select1

                    F_REQUIRED {

                        self.$fname

crates/tor-netdoc/src/parse2/derive.rs

+4 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ define_derive_deftly_module! { 
            let $fpatname = Option::unwrap_or_default($fpatname);

          }}

        )



        #[allow(deprecated)]

        Ok($vpat)

    }}

}
@@ -926,6 +928,7 @@ define_derive_deftly! { 
            }



            #[allow(unreachable_code)] // If there are no fields!

            #[allow(deprecated)]

            Ok(())

        }
@@ -1394,6 +1397,7 @@ define_derive_deftly! { 
            args.reject_extra_args()?;

          }}

            dtrace!("item complete Ok");

            #[allow(deprecated)]

            Ok($tname { $( $fname: $fpatname, ) })

        }

    }