summaryrefslogtreecommitdiff
path: root/dhall/src/phase/normalize.rs
diff options
context:
space:
mode:
authorFintanH2019-08-03 18:50:00 +0100
committerFintanH2019-08-03 18:50:00 +0100
commita390b54b6a55a348b7fc000f9f81d395996a32c1 (patch)
tree17c4f09f97961c2f7e23503548dd50fdebbf5f21 /dhall/src/phase/normalize.rs
parentfc309bf41dfe53d043766ec9d468389b2b4269ae (diff)
parent9113e15534f57626ae9be662738e1d3d22434e88 (diff)
Merge remote-tracking branch 'origin/master' into fintan/typecheck-combine-types
Diffstat (limited to 'dhall/src/phase/normalize.rs')
-rw-r--r--dhall/src/phase/normalize.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/dhall/src/phase/normalize.rs b/dhall/src/phase/normalize.rs
index 653f415..4a25ed9 100644
--- a/dhall/src/phase/normalize.rs
+++ b/dhall/src/phase/normalize.rs
@@ -404,7 +404,7 @@ where
kvs
}
-fn merge_maps<K, V>(
+pub(crate) fn merge_maps<K, V>(
map1: &HashMap<K, V>,
map2: &HashMap<K, V>,
mut f: impl FnMut(&V, &V) -> V,