From a70922c6c6beb58a45da80f15576b54fb915ec28 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 22 Mar 2020 22:11:00 +0000 Subject: Rework SimpleType --- dhall_proc_macros/src/derive.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dhall_proc_macros') diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs index f7edf3a..e484ec6 100644 --- a/dhall_proc_macros/src/derive.rs +++ b/dhall_proc_macros/src/derive.rs @@ -53,9 +53,9 @@ fn derive_for_struct( quote!( (#name.to_owned(), #ty) ) }); Ok(quote! { - ::serde_dhall::simple::TyKind::Record( + ::serde_dhall::SimpleType::Record( vec![ #(#entries),* ].into_iter().collect() - ).into() + ) }) } @@ -92,9 +92,9 @@ fn derive_for_enum( .collect::>()?; Ok(quote! { - ::serde_dhall::simple::TyKind::Union( + ::serde_dhall::SimpleType::Union( vec![ #(#entries),* ].into_iter().collect() - ).into() + ) }) } @@ -168,7 +168,7 @@ pub fn derive_static_type_inner( impl #impl_generics ::serde_dhall::StaticType for #ident #ty_generics #where_clause { - fn static_type() -> ::serde_dhall::simple::Type { + fn static_type() -> ::serde_dhall::SimpleType { #(#assertions)* #get_type } -- cgit v1.2.3