From 4b29fa3a9e329814c98df3463841eeb288f1630c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 17 Mar 2020 23:47:35 +0000
Subject: Remove never_type feature

---
 dhall/src/semantics/tck/typecheck.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'dhall/src/semantics/tck')

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)
-- 
cgit v1.2.3