From 980349dff0aaaa6ed34ae78d53ff57b67d7629d5 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 6 Dec 2020 17:18:58 +0000
Subject: Add test

---
 dhall/tests/import/success/unit/MixImportModesA.dhall | 1 +
 dhall/tests/import/success/unit/MixImportModesB.dhall | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 dhall/tests/import/success/unit/MixImportModesA.dhall
 create mode 100644 dhall/tests/import/success/unit/MixImportModesB.dhall

(limited to 'dhall/tests/import')

diff --git a/dhall/tests/import/success/unit/MixImportModesA.dhall b/dhall/tests/import/success/unit/MixImportModesA.dhall
new file mode 100644
index 0000000..8946ff8
--- /dev/null
+++ b/dhall/tests/import/success/unit/MixImportModesA.dhall
@@ -0,0 +1 @@
+{ n = ../../data/simple.dhall, txt = ../../data/simple.dhall as Text, loc = ../../data/simple.dhall as Location }
diff --git a/dhall/tests/import/success/unit/MixImportModesB.dhall b/dhall/tests/import/success/unit/MixImportModesB.dhall
new file mode 100644
index 0000000..a4e02f5
--- /dev/null
+++ b/dhall/tests/import/success/unit/MixImportModesB.dhall
@@ -0,0 +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" }
-- 
cgit v1.2.3


From 66dcbc5a6142693e79f89a837a3145ac6f810d3c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 6 Dec 2020 17:26:50 +0000
Subject: Prepare `ImportLocation` for more fields

---
 dhall/tests/import/failure/cycle.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/tests/import')

diff --git a/dhall/tests/import/failure/cycle.txt b/dhall/tests/import/failure/cycle.txt
index 899484b..a103312 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([Local("./dhall-lang/tests/import/data/cycle.dhall"), Local("./dhall-lang/tests/import/failure/cycle.dhall")], Local("./dhall-lang/tests/import/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") })
   |
   |
   |
-- 
cgit v1.2.3


From 6eb3612345c34e67acdc71662ea94f0952a48fd9 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 6 Dec 2020 17:47:32 +0000
Subject: An import location is not independent from the import mode

---
 dhall/tests/import/failure/cycle.txt                  | 2 +-
 dhall/tests/import/success/unit/MixImportModesB.dhall | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'dhall/tests/import')

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" }
-- 
cgit v1.2.3