From bf5d33f3ba991afe398d58fb4fed38ec72d6f4c7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 13 Aug 2019 16:31:41 +0200
Subject: Rework API to resemble that of serde_json

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

(limited to 'dhall_proc_macros')

diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index ea78766..79b553b 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -18,7 +18,7 @@ where
     T: quote::ToTokens,
 {
     quote!(
-        <#ty as ::serde_dhall::de::StaticType>::static_type()
+        <#ty as ::serde_dhall::StaticType>::static_type()
     )
 }
 
@@ -53,7 +53,7 @@ fn derive_for_struct(
         let ty = static_type(ty);
         quote!( (#name.to_owned(), #ty) )
     });
-    Ok(quote! { ::serde_dhall::de::Value::make_record_type(
+    Ok(quote! { ::serde_dhall::value::Value::make_record_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -90,7 +90,7 @@ fn derive_for_enum(
         })
         .collect::<Result<_, Error>>()?;
 
-    Ok(quote! { ::serde_dhall::de::Value::make_union_type(
+    Ok(quote! { ::serde_dhall::value::Value::make_union_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -134,7 +134,7 @@ pub fn derive_static_type_inner(
         let mut local_where_clause = orig_where_clause.clone();
         local_where_clause
             .predicates
-            .push(parse_quote!(#ty: ::serde_dhall::de::StaticType));
+            .push(parse_quote!(#ty: ::serde_dhall::StaticType));
         let phantoms = generics.params.iter().map(|param| match param {
             syn::GenericParam::Type(syn::TypeParam { ident, .. }) => {
                 quote!(#ident)
@@ -156,16 +156,16 @@ pub fn derive_static_type_inner(
     for ty in constraints.iter() {
         where_clause
             .predicates
-            .push(parse_quote!(#ty: ::serde_dhall::de::StaticType));
+            .push(parse_quote!(#ty: ::serde_dhall::StaticType));
     }
 
     let ident = &input.ident;
     let tokens = quote! {
-        impl #impl_generics ::serde_dhall::de::StaticType
+        impl #impl_generics ::serde_dhall::StaticType
                 for #ident #ty_generics
                 #where_clause {
             fn static_type() ->
-                    ::serde_dhall::de::Value {
+                    ::serde_dhall::value::Value {
                 #(#assertions)*
                 #get_type
             }
-- 
cgit v1.2.3