From 4d94c3bbf955c5c32cee0651820484c4e4b6cd90 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 8 Aug 2019 19:45:52 +0200 Subject: Update dhall-lang submodule --- dhall-lang | 2 +- dhall/build.rs | 3 +++ dhall/src/phase/normalize.rs | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dhall-lang b/dhall-lang index bf9783f..9729d89 160000 --- a/dhall-lang +++ b/dhall-lang @@ -1 +1 @@ -Subproject commit bf9783fc4298d5d54897af1631d677b05dd19db5 +Subproject commit 9729d8939a6c79adf9a26dd20978fba6ec39bbec diff --git a/dhall/build.rs b/dhall/build.rs index c05df0d..bcb5d1c 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -208,9 +208,12 @@ fn main() -> std::io::Result<()> { || path == "success/unit/RecursiveRecordMergeWithinFieldSelection0" || path == "success/unit/RecursiveRecordMergeWithinFieldSelection1" || path == "success/unit/RecursiveRecordMergeWithinFieldSelection2" + || path == "success/unit/RecursiveRecordMergeWithinFieldSelection3" || path == "success/unit/RightBiasedMergeWithinFieldSelection0" || path == "success/unit/RightBiasedMergeWithinFieldSelection1" || path == "success/unit/RightBiasedMergeWithinFieldSelection2" + || path == "success/unit/RightBiasedMergeWithinFieldSelection3" + || path == "success/unit/RightBiasedMergeEquivalentArguments" }, )?; diff --git a/dhall/src/phase/normalize.rs b/dhall/src/phase/normalize.rs index ecad063..405677a 100644 --- a/dhall/src/phase/normalize.rs +++ b/dhall/src/phase/normalize.rs @@ -54,6 +54,7 @@ pub fn apply_builtin(b: Builtin, args: Vec) -> Value { } (NaturalLit(0), b) => Ok((r, b.clone())), (_, NaturalLit(0)) => Ok((r, NaturalLit(0))), + _ if a == b => Ok((r, NaturalLit(0))), _ => Err(()), } } -- cgit v1.2.3