diff options
author | Nadrieril | 2019-08-08 19:45:52 +0200 |
---|---|---|
committer | Nadrieril | 2019-08-08 19:45:52 +0200 |
commit | 4d94c3bbf955c5c32cee0651820484c4e4b6cd90 (patch) | |
tree | babe260c49d23f6d5c2856f118d757fe7cc2c463 | |
parent | 071ba528cd8c6a222be345ddec7560bb45cca6be (diff) |
Update dhall-lang submodule
Diffstat (limited to '')
m--------- | dhall-lang | 0 | ||||
-rw-r--r-- | dhall/build.rs | 3 | ||||
-rw-r--r-- | dhall/src/phase/normalize.rs | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/dhall-lang b/dhall-lang -Subproject bf9783fc4298d5d54897af1631d677b05dd19db +Subproject 9729d8939a6c79adf9a26dd20978fba6ec39bbe 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<Thunk>) -> Value { } (NaturalLit(0), b) => Ok((r, b.clone())), (_, NaturalLit(0)) => Ok((r, NaturalLit(0))), + _ if a == b => Ok((r, NaturalLit(0))), _ => Err(()), } } |