Move recursion out of Expr

1 files changed, 18 insertions, 19 deletions

diff --git a/dhall_core/src/text.rs b/dhall_core/src/text.rs
index eef0797..d915553 100644
--- a/dhall_core/src/text.rs
+++ b/dhall_core/src/text.rs
@@ -1,17 +1,16 @@
-use crate::*;
 use std::iter::FromIterator;
 use std::ops::Add;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct InterpolatedText<Note, Embed> {
+pub struct InterpolatedText<SubExpr> {
     head: String,
-    tail: Vec<(SubExpr<Note, Embed>, String)>,
+    tail: Vec<(SubExpr, String)>,
 }
 
-impl<N, E> From<(String, Vec<(SubExpr<N, E>, String)>)>
-    for InterpolatedText<N, E>
+impl<SubExpr> From<(String, Vec<(SubExpr, String)>)>
+    for InterpolatedText<SubExpr>
 {
-    fn from(x: (String, Vec<(SubExpr<N, E>, String)>)) -> Self {
+    fn from(x: (String, Vec<(SubExpr, String)>)) -> Self {
         InterpolatedText {
             head: x.0,
             tail: x.1,
@@ -19,7 +18,7 @@ impl<N, E> From<(String, Vec<(SubExpr<N, E>, String)>)>
     }
 }
 
-impl<N, E> From<String> for InterpolatedText<N, E> {
+impl<SubExpr> From<String> for InterpolatedText<SubExpr> {
     fn from(s: String) -> Self {
         InterpolatedText {
             head: s,
@@ -29,15 +28,15 @@ impl<N, E> From<String> for InterpolatedText<N, E> {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum InterpolatedTextContents<Note, Embed> {
+pub enum InterpolatedTextContents<SubExpr> {
     Text(String),
-    Expr(SubExpr<Note, Embed>),
+    Expr(SubExpr),
 }
 
-impl<N, E> InterpolatedText<N, E> {
-    pub fn map<N2, E2, F>(&self, mut f: F) -> InterpolatedText<N2, E2>
+impl<SubExpr: Clone> InterpolatedText<SubExpr> {
+    pub fn map<SubExpr2, F>(&self, mut f: F) -> InterpolatedText<SubExpr2>
     where
-        F: FnMut(&SubExpr<N, E>) -> SubExpr<N2, E2>,
+        F: FnMut(&SubExpr) -> SubExpr2,
     {
         InterpolatedText {
             head: self.head.clone(),
@@ -47,7 +46,7 @@ impl<N, E> InterpolatedText<N, E> {
 
     pub fn iter<'a>(
         &'a self,
-    ) -> impl Iterator<Item = InterpolatedTextContents<N, E>> + 'a {
+    ) -> impl Iterator<Item = InterpolatedTextContents<SubExpr>> + 'a {
         use std::iter::once;
         once(InterpolatedTextContents::Text(self.head.clone())).chain(
             self.tail.iter().flat_map(|(e, s)| {
@@ -58,12 +57,12 @@ impl<N, E> InterpolatedText<N, E> {
     }
 }
 
-impl<'a, N: 'a, E: 'a> FromIterator<InterpolatedTextContents<N, E>>
-    for InterpolatedText<N, E>
+impl<'a, SubExpr: Clone + 'a> FromIterator<InterpolatedTextContents<SubExpr>>
+    for InterpolatedText<SubExpr>
 {
     fn from_iter<T>(iter: T) -> Self
     where
-        T: IntoIterator<Item = InterpolatedTextContents<N, E>>,
+        T: IntoIterator<Item = InterpolatedTextContents<SubExpr>>,
     {
         let mut res = InterpolatedText {
             head: "".to_owned(),
@@ -83,9 +82,9 @@ impl<'a, N: 'a, E: 'a> FromIterator<InterpolatedTextContents<N, E>>
     }
 }
 
-impl<N, E> Add for &InterpolatedText<N, E> {
-    type Output = InterpolatedText<N, E>;
-    fn add(self, rhs: &InterpolatedText<N, E>) -> Self::Output {
+impl<SubExpr: Clone> Add for &InterpolatedText<SubExpr> {
+    type Output = InterpolatedText<SubExpr>;
+    fn add(self, rhs: &InterpolatedText<SubExpr>) -> Self::Output {
         self.iter().chain(rhs.iter()).collect()
     }
 }