summaryrefslogtreecommitdiff
path: root/dhall/src
diff options
context:
space:
mode:
authorNadrieril2019-03-09 11:38:50 +0100
committerNadrieril2019-03-09 11:38:50 +0100
commit5ae6b4320b033519bdfdb8529b8c7382b0ba5ee9 (patch)
treef6c43fc82b8e75cc345b89cc4cb7ae844956637b /dhall/src
parent19c18f9cd0d192f326fc2946729645cab5e1d416 (diff)
A whole new bunch of tests now pass !
Diffstat (limited to 'dhall/src')
-rw-r--r--dhall/src/imports.rs1
-rw-r--r--dhall/src/normalize.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/dhall/src/imports.rs b/dhall/src/imports.rs
index ea3ef01..9ae66a7 100644
--- a/dhall/src/imports.rs
+++ b/dhall/src/imports.rs
@@ -35,6 +35,7 @@ fn resolve_import(
Local(prefix, path) => {
let path = match prefix {
Parent => cwd.parent().unwrap().join(path),
+ Here => cwd.join(path),
_ => unimplemented!("{:?}", import),
};
load_dhall_file(&path, true)
diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs
index c3bea05..16d670f 100644
--- a/dhall/src/normalize.rs
+++ b/dhall/src/normalize.rs
@@ -186,7 +186,7 @@ where
let ys = ys.into_iter();
ListLit(t, xs.chain(ys).collect())
}
- Merge(_x, _y, _t) => unimplemented!(),
+ // Merge(_x, _y, _t) => unimplemented!(),
Field(box RecordLit(kvs), x) => match kvs.get(&x) {
Some(r) => r.clone(),
None => Field(bx(RecordLit(kvs)), x),