Merge remote-tracking branch 'origin/master' into fintan/canonicalize

2 files changed, 7 insertions, 9 deletions

diff --git a/dhall_proc_macros/Cargo.toml b/dhall_proc_macros/Cargo.toml
index 76a749f..df1eda8 100644
--- a/dhall_proc_macros/Cargo.toml
+++ b/dhall_proc_macros/Cargo.toml
@@ -14,4 +14,3 @@ itertools = "0.8.0"
 quote = "0.6.11"
 proc-macro2 = "0.4.27"
 syn = "0.15.29"
-dhall_syntax = { path = "../dhall_syntax" }
diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index 725cdfb..140ff20 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -1,5 +1,4 @@
 extern crate proc_macro;
-// use dhall_syntax::*;
 use proc_macro::TokenStream;
 use quote::{quote, quote_spanned};
 use syn::spanned::Spanned;
@@ -18,7 +17,7 @@ where
     T: quote::ToTokens,
 {
     quote!(
-        <#ty as ::dhall::de::StaticType>::static_type()
+        <#ty as ::serde_dhall::StaticType>::static_type()
     )
 }
 
@@ -53,7 +52,7 @@ fn derive_for_struct(
         let ty = static_type(ty);
         quote!( (#name.to_owned(), #ty) )
     });
-    Ok(quote! { ::dhall::de::Type::make_record_type(
+    Ok(quote! { ::serde_dhall::value::Value::make_record_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -90,7 +89,7 @@ fn derive_for_enum(
         })
         .collect::<Result<_, Error>>()?;
 
-    Ok(quote! { ::dhall::de::Type::make_union_type(
+    Ok(quote! { ::serde_dhall::value::Value::make_union_type(
         vec![ #(#entries),* ].into_iter()
     ) })
 }
@@ -134,7 +133,7 @@ pub fn derive_static_type_inner(
         let mut local_where_clause = orig_where_clause.clone();
         local_where_clause
             .predicates
-            .push(parse_quote!(#ty: ::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 +155,16 @@ pub fn derive_static_type_inner(
     for ty in constraints.iter() {
         where_clause
             .predicates
-            .push(parse_quote!(#ty: ::dhall::de::StaticType));
+            .push(parse_quote!(#ty: ::serde_dhall::StaticType));
     }
 
     let ident = &input.ident;
     let tokens = quote! {
-        impl #impl_generics ::dhall::de::StaticType
+        impl #impl_generics ::serde_dhall::StaticType
                 for #ident #ty_generics
                 #where_clause {
             fn static_type() ->
-                    ::dhall::de::Type {
+                    ::serde_dhall::value::Value {
                 #(#assertions)*
                 #get_type
             }