summaryrefslogtreecommitdiff
path: root/dhall/src/operations
diff options
context:
space:
mode:
authorNadrieril2021-01-22 19:49:08 +0000
committerGitHub2021-01-22 19:49:08 +0000
commit1397a53da0a6aa6d75b687c275baa21d3b99ed64 (patch)
tree5f9cb0058ce1799df482b7b03b3375da3b28ae2d /dhall/src/operations
parent11ff03a8113580244ced04a8b370ab6192b8e413 (diff)
parentb70f16f865967375e5d80ff5b8979179072c73b4 (diff)
Merge pull request #209 from Nadrieril/fix-ci
Diffstat (limited to '')
-rw-r--r--dhall/src/operations/typecheck.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/dhall/src/operations/typecheck.rs b/dhall/src/operations/typecheck.rs
index 9b19c84..e62a8cc 100644
--- a/dhall/src/operations/typecheck.rs
+++ b/dhall/src/operations/typecheck.rs
@@ -219,10 +219,8 @@ fn typecheck_merge<'cx>(
// TODO: this actually doesn't check anything yet
match closure.remove_binder() {
- Ok(v) => Type::new_infer_universe(env, v.clone())?,
- Err(()) => {
- return span_err("MergeReturnTypeIsDependent")
- }
+ Some(v) => Type::new_infer_universe(env, v.clone())?,
+ None => return span_err("MergeReturnTypeIsDependent"),
}
}
_ => {