Capture `Span`s in the AST and thread them through Parsed and Resolved

1 files changed, 5 insertions, 6 deletions

diff --git a/dhall/src/imports.rs b/dhall/src/imports.rs
index cc9654a..36f0802 100644
--- a/dhall/src/imports.rs
+++ b/dhall/src/imports.rs
@@ -3,7 +3,6 @@ use crate::expr::*;
 use dhall_core::*;
 use std::fs::File;
 use std::io::Read;
-use std::marker::PhantomData;
 use std::path::Path;
 use std::path::PathBuf;
 
@@ -50,7 +49,7 @@ fn load_import(f: &Path) -> Result<Normalized<'static>, Error> {
 }
 
 fn resolve_expr<'a>(
-    Parsed(expr, root, marker): Parsed<'a>,
+    Parsed(expr, root): Parsed<'a>,
     allow_imports: bool,
 ) -> Result<Resolved<'a>, ImportError> {
     let resolve =
@@ -63,7 +62,7 @@ fn resolve_expr<'a>(
             }
         };
     let expr = expr.as_ref().traverse_embed(&resolve)?;
-    Ok(Resolved(rc(expr), marker))
+    Ok(Resolved(rc(expr)))
 }
 
 impl<'a> Parsed<'a> {
@@ -72,13 +71,13 @@ impl<'a> Parsed<'a> {
         File::open(f)?.read_to_string(&mut buffer)?;
         let expr = parse_expr(&*buffer)?;
         let root = ImportRoot::LocalDir(f.parent().unwrap().to_owned());
-        Ok(Parsed(expr, root, PhantomData))
+        Ok(Parsed(expr.unnote().note_absurd(), root))
     }
 
     pub fn parse_str(s: &'a str) -> Result<Parsed<'a>, Error> {
         let expr = parse_expr(s)?;
         let root = ImportRoot::LocalDir(std::env::current_dir()?);
-        Ok(Parsed(expr, root, PhantomData))
+        Ok(Parsed(expr, root))
     }
 
     pub fn parse_binary_file(f: &Path) -> Result<Parsed<'a>, Error> {
@@ -86,7 +85,7 @@ impl<'a> Parsed<'a> {
         File::open(f)?.read_to_end(&mut buffer)?;
         let expr = crate::binary::decode(&buffer)?;
         let root = ImportRoot::LocalDir(f.parent().unwrap().to_owned());
-        Ok(Parsed(expr, root, PhantomData))
+        Ok(Parsed(expr.note_absurd(), root))
     }
 
     pub fn resolve(self) -> Result<Resolved<'a>, ImportError> {