From 0f33caf4c1ee4d1f95d6ac3a41b5cf2f8efa7b54 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 16 Mar 2019 22:41:22 +0100 Subject: Use Box more uniformly in AST Closes #28 --- dhall_generator/src/lib.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'dhall_generator/src/lib.rs') diff --git a/dhall_generator/src/lib.rs b/dhall_generator/src/lib.rs index 1d51f9e..1a74f4f 100644 --- a/dhall_generator/src/lib.rs +++ b/dhall_generator/src/lib.rs @@ -125,12 +125,14 @@ fn label_to_tokenstream(l: &Label) -> TokenStream { } fn map_to_tokenstream( - m: &BTreeMap>, + m: &BTreeMap>>, ctx: &Context, ) -> TokenStream { let (keys, values): (Vec, Vec) = m .iter() - .map(|(k, v)| (label_to_tokenstream(k), dhall_to_tokenstream(v, ctx))) + .map(|(k, v)| { + (label_to_tokenstream(k), dhall_to_tokenstream_bx(&*v, ctx)) + }) .unzip(); quote! { { let mut m = BTreeMap::new(); @@ -151,10 +153,10 @@ fn option_to_tokenstream( } fn vec_to_tokenstream( - e: &Vec>, + e: &Vec>>, ctx: &Context, ) -> TokenStream { - let e = e.iter().map(|x| dhall_to_tokenstream(x, ctx)); + let e = e.iter().map(|x| dhall_to_tokenstream_bx(&**x, ctx)); quote! { vec![ #(#e),* ] } } -- cgit v1.2.3