summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
m---------dhall-lang0
-rw-r--r--dhall/build.rs28
-rw-r--r--dhall/src/phase/typecheck.rs5
3 files changed, 18 insertions, 15 deletions
diff --git a/dhall-lang b/dhall-lang
-Subproject 2c0f2389e11597131b8ce021344322e5ed3a913
+Subproject 65aa7435040141dd30d5983695b7ebdb4224b28
diff --git a/dhall/build.rs b/dhall/build.rs
index cdbd560..db66e3c 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -92,14 +92,14 @@ fn main() -> std::io::Result<()> {
|| path == "success/unit/import/inlineUsing"
// TODO: projection by expression
|| path == "success/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpressionEmpty"
+ || path == "success/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByTypeEmpty"
+ || path == "success/unit/RecordProjectFields"
// TODO: RFC3986 URLs
|| path == "success/unit/import/urls/emptyPath0"
|| path == "success/unit/import/urls/emptyPath1"
|| path == "success/unit/import/urls/emptyPathSegment"
- // Test is broken
- || path == "success/unit/import/asLocation"
},
)?;
@@ -117,14 +117,13 @@ fn main() -> std::io::Result<()> {
|| path == "success/unit/import/inlineUsing"
// TODO: projection by expression
|| path == "success/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpressionEmpty"
+ || path == "success/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByTypeEmpty"
// TODO: RFC3986 URLs
|| path == "success/unit/import/urls/emptyPath0"
|| path == "success/unit/import/urls/emptyPath1"
|| path == "success/unit/import/urls/emptyPathSegment"
- // Test is broken
- || path == "success/unit/import/asLocation"
},
)?;
@@ -147,14 +146,13 @@ fn main() -> std::io::Result<()> {
|| path == "success/unit/import/inlineUsing"
// TODO: projection by expression
|| path == "success/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpression"
- || path == "success/unit/recordProjectionByExpressionEmpty"
+ || path == "success/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByType"
+ || path == "success/unit/RecordProjectionByTypeEmpty"
// TODO: RFC3986 URLs
|| path == "success/unit/import/urls/emptyPath0"
|| path == "success/unit/import/urls/emptyPath1"
|| path == "success/unit/import/urls/emptyPathSegment"
- // Test is broken
- || path == "success/unit/import/asLocation"
},
)?;
@@ -169,9 +167,9 @@ fn main() -> std::io::Result<()> {
// Too slow
|| path == "success/remoteSystems"
// TODO: projection by expression
- || path == "success/unit/RecordProjectionTypeEmpty"
- || path == "success/unit/RecordProjectionTypeNonEmpty"
- || path == "success/unit/RecordProjectionTypeNormalizeProjection"
+ || path == "success/unit/RecordProjectionByTypeEmpty"
+ || path == "success/unit/RecordProjectionByTypeNonEmpty"
+ || path == "success/unit/RecordProjectionByTypeNormalizeProjection"
// TODO: fix Double/show
|| path == "success/prelude/JSON/number/1"
},
diff --git a/dhall/src/phase/typecheck.rs b/dhall/src/phase/typecheck.rs
index 753d25e..bd09b35 100644
--- a/dhall/src/phase/typecheck.rs
+++ b/dhall/src/phase/typecheck.rs
@@ -1195,6 +1195,8 @@ mod spec_tests {
tc_failure!(tc_failure_unit_RecordProjectionEmpty, "unit/RecordProjectionEmpty");
tc_failure!(tc_failure_unit_RecordProjectionNotPresent, "unit/RecordProjectionNotPresent");
tc_failure!(tc_failure_unit_RecordProjectionNotRecord, "unit/RecordProjectionNotRecord");
+ // tc_failure!(tc_failure_unit_RecordProjectionByTypeFieldTypeMismatch, "unit/RecordProjectionByTypeFieldTypeMismatch");
+ // tc_failure!(tc_failure_unit_RecordProjectionByTypeNotPresent, "unit/RecordProjectionByTypeNotPresent");
tc_failure!(tc_failure_unit_RecordSelectionEmpty, "unit/RecordSelectionEmpty");
tc_failure!(tc_failure_unit_RecordSelectionNotPresent, "unit/RecordSelectionNotPresent");
tc_failure!(tc_failure_unit_RecordSelectionNotRecord, "unit/RecordSelectionNotRecord");
@@ -1220,6 +1222,7 @@ mod spec_tests {
tc_failure!(tc_failure_unit_TextLiteralInterpolateNotText, "unit/TextLiteralInterpolateNotText");
tc_failure!(tc_failure_unit_TypeAnnotationWrong, "unit/TypeAnnotationWrong");
tc_failure!(tc_failure_unit_UnionConstructorFieldNotPresent, "unit/UnionConstructorFieldNotPresent");
+ tc_failure!(tc_failure_unit_UnionDeprecatedConstructorsKeyword, "unit/UnionDeprecatedConstructorsKeyword");
tc_failure!(tc_failure_unit_UnionTypeMixedKinds, "unit/UnionTypeMixedKinds");
tc_failure!(tc_failure_unit_UnionTypeMixedKinds2, "unit/UnionTypeMixedKinds2");
tc_failure!(tc_failure_unit_UnionTypeMixedKinds3, "unit/UnionTypeMixedKinds3");
@@ -1310,6 +1313,8 @@ mod spec_tests {
ti_success!(ti_success_unit_RecordProjectionKind, "unit/RecordProjectionKind");
ti_success!(ti_success_unit_RecordProjectionType, "unit/RecordProjectionType");
ti_success!(ti_success_unit_RecordProjectionValue, "unit/RecordProjectionValue");
+ // ti_success!(ti_success_unit_RecordProjectionByTypeEmpty, "unit/RecordProjectionByTypeEmpty");
+ // ti_success!(ti_success_unit_RecordProjectionByTypeJudgmentalEquality, "unit/RecordProjectionByTypeJudgmentalEquality");
ti_success!(ti_success_unit_RecordSelectionKind, "unit/RecordSelectionKind");
ti_success!(ti_success_unit_RecordSelectionType, "unit/RecordSelectionType");
ti_success!(ti_success_unit_RecordSelectionValue, "unit/RecordSelectionValue");