summaryrefslogtreecommitdiff
path: root/dhall/tests
diff options
context:
space:
mode:
authorNadrieril2020-12-06 17:47:32 +0000
committerNadrieril2020-12-06 17:57:51 +0000
commit6eb3612345c34e67acdc71662ea94f0952a48fd9 (patch)
tree6683139c30ecba7b0875669b81472ae375eb1477 /dhall/tests
parent66dcbc5a6142693e79f89a837a3145ac6f810d3c (diff)
An import location is not independent from the import mode
Diffstat (limited to 'dhall/tests')
-rw-r--r--dhall/tests/import/failure/cycle.txt2
-rw-r--r--dhall/tests/import/success/unit/MixImportModesB.dhall2
-rw-r--r--dhall/tests/spec.rs2
3 files changed, 2 insertions, 4 deletions
diff --git a/dhall/tests/import/failure/cycle.txt b/dhall/tests/import/failure/cycle.txt
index a103312..641667f 100644
--- a/dhall/tests/import/failure/cycle.txt
+++ b/dhall/tests/import/failure/cycle.txt
@@ -10,7 +10,7 @@ Type error: error: error
--> <current file>:1:1
|
1 | ../data/cycle.dhall
- | ^^^^^^^^^^^^^^^^^^^ ImportCycle([ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall") }, ImportLocation { kind: Local("./dhall-lang/tests/import/failure/cycle.dhall") }], ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall") })
+ | ^^^^^^^^^^^^^^^^^^^ ImportCycle([ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall"), mode: Code }, ImportLocation { kind: Local("./dhall-lang/tests/import/failure/cycle.dhall"), mode: Code }], ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall"), mode: Code })
|
|
|
diff --git a/dhall/tests/import/success/unit/MixImportModesB.dhall b/dhall/tests/import/success/unit/MixImportModesB.dhall
index a4e02f5..430e0bc 100644
--- a/dhall/tests/import/success/unit/MixImportModesB.dhall
+++ b/dhall/tests/import/success/unit/MixImportModesB.dhall
@@ -1 +1 @@
-{ loc = < Environment: Text | Local: Text | Missing | Remote: Text >.Local "./dhall/tests/import/data/simple.dhall", n = < Environment: Text | Local: Text | Missing | Remote: Text >.Local "./dhall/tests/import/data/simple.dhall", txt = < Environment: Text | Local: Text | Missing | Remote: Text >.Local "./dhall/tests/import/data/simple.dhall" }
+{ loc = < Environment: Text | Local: Text | Missing | Remote: Text >.Local "./dhall/tests/import/data/simple.dhall", n = 3, txt = "3\n" }
diff --git a/dhall/tests/spec.rs b/dhall/tests/spec.rs
index d3db321..6b156f6 100644
--- a/dhall/tests/spec.rs
+++ b/dhall/tests/spec.rs
@@ -535,8 +535,6 @@ fn ignore_test(variant: SpecTestKind, path: &str) -> bool {
// Failing for now, we should fix that.
let is_failing_for_now = false
- // TODO: fix that one
- // || path == "import/success/unit/MixImportModes"
// TODO: fails because of caching issues.
|| path == "type-inference/success/prelude"
// TODO: do not recover from cyclic imports