From 66bed8dbc7249e17a89adcbb19406f4126a434de Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 8 Mar 2019 22:37:32 +0100
Subject: Finally get rid of all the &'i str

---
 dhall/src/imports.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'dhall/src/imports.rs')

diff --git a/dhall/src/imports.rs b/dhall/src/imports.rs
index 6d8d670..4240b5e 100644
--- a/dhall/src/imports.rs
+++ b/dhall/src/imports.rs
@@ -1,12 +1,11 @@
-use dhall_core::{Expr, FilePrefix, Import, ImportLocation, ImportMode, X};
+// use dhall_core::{Expr, FilePrefix, Import, ImportLocation, ImportMode, X};
+use dhall_core::{Expr_, StringLike, Import, X};
+// use std::path::Path;
+// use std::path::PathBuf;
 
-// fn resolve_import(import: Import) -> Expr<X, Import> {
-
-// }
-
-pub fn resolve_imports<'i, S: Clone>(
-    expr: &Expr<'i, S, Import>,
-) -> Expr<'i, S, X> {
+pub fn resolve_imports<Label: StringLike, S: Clone>(
+    expr: &Expr_<Label, S, Import>,
+) -> Expr_<Label, S, X> {
     let no_import = |_: &Import| -> X { panic!("ahhh import") };
     expr.map_embed(&no_import)
 }
-- 
cgit v1.2.3