From e27adcdce55dc15c97bb0ac6d5bc0b082d2232c2 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sat, 9 Mar 2019 14:32:07 +0100
Subject: Use new Label type instead of &str in parser

---
 dhall/src/imports.rs | 2 +-
 dhall/src/main.rs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall')

diff --git a/dhall/src/imports.rs b/dhall/src/imports.rs
index 9ae66a7..d9f0b33 100644
--- a/dhall/src/imports.rs
+++ b/dhall/src/imports.rs
@@ -75,7 +75,7 @@ pub fn load_dhall_file(
     let mut buffer = String::new();
     File::open(f)?.read_to_string(&mut buffer)?;
     let expr = parser::parse_expr(&*buffer)?;
-    let expr = expr.take_ownership_of_labels();
+    let expr = expr.map_label(&|l| String::from(l.clone()));
     let expr = if resolve_imports {
         let root = ImportRoot::LocalDir(f.parent().unwrap().to_owned());
         let resolve = |import: &Import| -> Expr<String, X, X> {
diff --git a/dhall/src/main.rs b/dhall/src/main.rs
index d072fe7..db69a46 100644
--- a/dhall/src/main.rs
+++ b/dhall/src/main.rs
@@ -65,8 +65,8 @@ fn main() {
         }
     };
 
-    let expr: Expr<String, _, _> =
-        imports::panic_imports(&expr.take_ownership_of_labels());
+    let expr: Expr<Label, _, _> =
+        imports::panic_imports(&expr);
 
     let type_expr = match typecheck::type_of(&expr) {
         Err(e) => {
-- 
cgit v1.2.3