From 34a0cc04bff10396a69115154cb10c28f45feff1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 13 Apr 2022 10:52:20 +0100 Subject: [PATCH] Move impl<'a> ToTokens for BuilderFieldType<'a> As per https://github.com/colin-kiegel/rust-derive-builder/pull/245#discussion_r843042088 --- derive_builder_core/src/builder_field.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/derive_builder_core/src/builder_field.rs b/derive_builder_core/src/builder_field.rs index 321d2051..ec7567b4 100644 --- a/derive_builder_core/src/builder_field.rs +++ b/derive_builder_core/src/builder_field.rs @@ -73,6 +73,17 @@ impl<'a> BuilderFieldType<'a> { } } +impl<'a> ToTokens for BuilderFieldType<'a> { + fn to_tokens(&self, tokens: &mut TokenStream) { + match self { + BuilderFieldType::Optional(ty) => tokens.append_all(quote!( + ::derive_builder::export::core::option::Option<#ty> + )), + BuilderFieldType::Precisely(ty) => ty.to_tokens(tokens), + } + } +} + impl<'a> ToTokens for BuilderField<'a> { fn to_tokens(&self, tokens: &mut TokenStream) { if self.field_enabled { @@ -96,17 +107,6 @@ impl<'a> ToTokens for BuilderField<'a> { } } -impl<'a> ToTokens for BuilderFieldType<'a> { - fn to_tokens(&self, tokens: &mut TokenStream) { - match self { - BuilderFieldType::Optional(ty) => tokens.append_all(quote!( - ::derive_builder::export::core::option::Option<#ty> - )), - BuilderFieldType::Precisely(ty) => ty.to_tokens(tokens), - } - } -} - impl<'a> BuilderField<'a> { /// Emits a struct field initializer that initializes the field to `Default::default`. pub fn default_initializer_tokens(&self) -> TokenStream {