diff options
| author | Nadrieril Feneanar | 2020-03-18 00:01:11 +0000 |
|---|---|---|
| committer | GitHub | 2020-03-18 00:01:11 +0000 |
| commit | f42ab8acdaa4dee753b7daccfed1ca3c8738095a (patch) | |
| tree | 9fba7dd6d865884c0651af2dd7e01b243a0f25f0 /dhall/src/semantics/tck | |
| parent | 71fddc59b5b427f52dd2f0cd76f788eb995a4e2e (diff) | |
| parent | 40441abd2d6c2938244fa1bb2ca26ee9b8e4ab27 (diff) | |
Merge pull request #146 from Nadrieril/never_never
Use stable toolchain 🎉
Diffstat (limited to 'dhall/src/semantics/tck')
| -rw-r--r-- | dhall/src/semantics/tck/typecheck.rs | 4 |
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) |