From 4e11e882b7d064e9ddf997f9a465206cf6e471aa Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 8 Mar 2020 17:36:51 +0000
Subject: Split serde_dhall::Value to separate values from types

---
 dhall_proc_macros/src/derive.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall_proc_macros/src/derive.rs')

diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index 48626a0..3a4f1aa 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -52,7 +52,7 @@ fn derive_for_struct(
         let ty = static_type(ty);
         quote!( (#name.to_owned(), #ty) )
     });
-    Ok(quote! { ::serde_dhall::value::Value::make_record_type(
+    Ok(quote! { ::serde_dhall::Type::make_record_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -89,7 +89,7 @@ fn derive_for_enum(
         })
         .collect::<Result<_, Error>>()?;
 
-    Ok(quote! { ::serde_dhall::value::Value::make_union_type(
+    Ok(quote! { ::serde_dhall::Type::make_union_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -165,7 +165,7 @@ pub fn derive_static_type_inner(
                 for #ident #ty_generics
                 #where_clause {
             fn static_type() ->
-                    ::serde_dhall::value::Value {
+                    ::serde_dhall::Type {
                 #(#assertions)*
                 #get_type
             }
-- 
cgit v1.2.3


From 1a0929b52af57d5963dd9da9e5cf85ffbed3a8f7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 13 Mar 2020 20:53:23 +0000
Subject: Reorganize serde modules

---
 dhall_proc_macros/src/derive.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall_proc_macros/src/derive.rs')

diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index 3a4f1aa..4885b49 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -52,7 +52,7 @@ fn derive_for_struct(
         let ty = static_type(ty);
         quote!( (#name.to_owned(), #ty) )
     });
-    Ok(quote! { ::serde_dhall::Type::make_record_type(
+    Ok(quote! { ::serde_dhall::simple::Type::make_record_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -89,7 +89,7 @@ fn derive_for_enum(
         })
         .collect::<Result<_, Error>>()?;
 
-    Ok(quote! { ::serde_dhall::Type::make_union_type(
+    Ok(quote! { ::serde_dhall::simple::Type::make_union_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -165,7 +165,7 @@ pub fn derive_static_type_inner(
                 for #ident #ty_generics
                 #where_clause {
             fn static_type() ->
-                    ::serde_dhall::Type {
+                    ::serde_dhall::simple::Type {
                 #(#assertions)*
                 #get_type
             }
-- 
cgit v1.2.3


From a1f370cb68974c1e69f8f85345e91ec763b23ae2 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 18 Mar 2020 22:28:41 +0000
Subject: Expose simple::Val/Ty properly in the API

---
 dhall_proc_macros/src/derive.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'dhall_proc_macros/src/derive.rs')

diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index 4885b49..f7edf3a 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -52,9 +52,11 @@ fn derive_for_struct(
         let ty = static_type(ty);
         quote!( (#name.to_owned(), #ty) )
     });
-    Ok(quote! { ::serde_dhall::simple::Type::make_record_type(
-        vec![ #(#entries),* ].into_iter()
-    ) })
+    Ok(quote! {
+        ::serde_dhall::simple::TyKind::Record(
+            vec![ #(#entries),* ].into_iter().collect()
+        ).into()
+    })
 }
 
 fn derive_for_enum(
@@ -89,9 +91,11 @@ fn derive_for_enum(
         })
         .collect::<Result<_, Error>>()?;
 
-    Ok(quote! { ::serde_dhall::simple::Type::make_union_type(
-        vec![ #(#entries),* ].into_iter()
-    ) })
+    Ok(quote! {
+        ::serde_dhall::simple::TyKind::Union(
+            vec![ #(#entries),* ].into_iter().collect()
+        ).into()
+    })
 }
 
 pub fn derive_static_type_inner(
@@ -164,8 +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::simple::Type {
                 #(#assertions)*
                 #get_type
             }
-- 
cgit v1.2.3


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/src/derive.rs')

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::<Result<_, Error>>()?;
 
     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