summaryrefslogtreecommitdiff
path: root/dhall/src/semantics/tck
diff options
context:
space:
mode:
authorNadrieril2020-03-17 23:47:35 +0000
committerNadrieril2020-03-17 23:47:58 +0000
commit4b29fa3a9e329814c98df3463841eeb288f1630c (patch)
tree4c933c9228e74e9b12351ea797c38d161eb6fe80 /dhall/src/semantics/tck
parent71fddc59b5b427f52dd2f0cd76f788eb995a4e2e (diff)
Remove never_type feature
Diffstat (limited to 'dhall/src/semantics/tck')
-rw-r--r--dhall/src/semantics/tck/typecheck.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/dhall/src/semantics/tck/typecheck.rs b/dhall/src/semantics/tck/typecheck.rs
index 365df25..173b76d 100644
--- a/dhall/src/semantics/tck/typecheck.rs
+++ b/dhall/src/semantics/tck/typecheck.rs
@@ -346,9 +346,7 @@ fn type_one_layer(
// Union the two records, prefering
// the values found in the RHS.
- let kts = merge_maps::<_, _, _, !>(kts_x, kts_y, |_, _, r_t| {
- Ok(r_t.clone())
- })?;
+ let kts = merge_maps(kts_x, kts_y, |_, _, r_t| r_t.clone());
let u = max(x.ty().ty(), y.ty().ty());
Nir::from_kind(NirKind::RecordType(kts)).to_type(u)