summaryrefslogtreecommitdiff
path: root/dhall/src/imports.rs
diff options
context:
space:
mode:
authorNadrieril2019-03-08 22:37:32 +0100
committerNadrieril2019-03-08 22:37:32 +0100
commit66bed8dbc7249e17a89adcbb19406f4126a434de (patch)
tree211c309fb3aea301314871899d1286b70eafa05c /dhall/src/imports.rs
parent0916eafc12b0ccbbf5b524a273903a0a84f30e74 (diff)
Finally get rid of all the &'i str
Diffstat (limited to 'dhall/src/imports.rs')
-rw-r--r--dhall/src/imports.rs15
1 files changed, 7 insertions, 8 deletions
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)
}