From 542e316e456b676da791585379ba7da9ebb343f3 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 7 May 2019 12:30:34 +0200
Subject: Fix derive

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

(limited to 'dhall_proc_macros/src')

diff --git a/dhall_proc_macros/src/derive.rs b/dhall_proc_macros/src/derive.rs
index 1ccb28b..a5f0925 100644
--- a/dhall_proc_macros/src/derive.rs
+++ b/dhall_proc_macros/src/derive.rs
@@ -169,9 +169,9 @@ pub fn derive_simple_static_type_inner(
                 for #ident #ty_generics
                 #where_clause {
             fn get_simple_static_type() ->
-                    ::dhall::expr::SimpleType {
+                    ::dhall::de::SimpleType {
                 #(#assertions)*
-                ::dhall::expr::SimpleType::from(#get_type)
+                ::dhall::de::SimpleType::from(#get_type)
             }
         }
     };
-- 
cgit v1.2.3


From 726c281cdd3824fcfdde34fe8d01f95416f7808c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 7 May 2019 16:01:24 +0200
Subject: Clean up some of the SubExpr type-changing methods

---
 dhall_proc_macros/src/quote.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'dhall_proc_macros/src')

diff --git a/dhall_proc_macros/src/quote.rs b/dhall_proc_macros/src/quote.rs
index eaf4946..77ed5de 100644
--- a/dhall_proc_macros/src/quote.rs
+++ b/dhall_proc_macros/src/quote.rs
@@ -7,7 +7,7 @@ use std::collections::BTreeMap;
 
 pub fn expr(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input_str = input.to_string();
-    let expr: SubExpr<_, Import> = parse_expr(&input_str).unwrap().unnote();
+    let expr: SubExpr<_, Import> = parse_expr(&input_str).unwrap();
     let no_import =
         |_: &Import| -> X { panic!("Don't use import in dhall::expr!()") };
     let expr = expr.map_embed(no_import);
@@ -17,7 +17,7 @@ pub fn expr(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 
 pub fn subexpr(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input_str = input.to_string();
-    let expr: SubExpr<_, Import> = parse_expr(&input_str).unwrap().unnote();
+    let expr: SubExpr<_, Import> = parse_expr(&input_str).unwrap();
     let no_import =
         |_: &Import| -> X { panic!("Don't use import in dhall::subexpr!()") };
     let expr = expr.map_embed(no_import);
@@ -94,8 +94,8 @@ where
 
 // Returns an expression of type SubExpr<_, _>. Expects interpolated variables
 // to be of type SubExpr<_, _>.
-fn quote_subexpr(
-    expr: &SubExpr<X, X>,
+fn quote_subexpr<N>(
+    expr: &SubExpr<N, X>,
     ctx: &Context<Label, ()>,
 ) -> TokenStream {
     use dhall_syntax::ExprF::*;
@@ -131,7 +131,7 @@ fn quote_subexpr(
 
 // Returns an expression of type Expr<_, _>. Expects interpolated variables
 // to be of type SubExpr<_, _>.
-fn quote_expr(expr: &Expr<X, X>, ctx: &Context<Label, ()>) -> TokenStream {
+fn quote_expr<N>(expr: &Expr<N, X>, ctx: &Context<Label, ()>) -> TokenStream {
     use dhall_syntax::ExprF::*;
     match expr.map_ref_with_special_handling_of_binders(
         |e| quote_subexpr(e, ctx),
-- 
cgit v1.2.3