diff options
| author | Nadrieril | 2020-03-31 20:25:02 +0100 |
|---|---|---|
| committer | GitHub | 2020-03-31 20:25:02 +0100 |
| commit | 5a5aa49e64197899006751db72e404f4b2292d4e (patch) | |
| tree | 0b62e961c1de99ce9a78c4775ce8eab047cdf768 | |
| parent | eecd41fe5dd155752aaaa06af02bc32f8a416ba5 (diff) | |
| parent | e12fb2928307d240461e749e5d371cef17cf520c (diff) | |
Merge pull request #156 from Nadrieril/fix-155
Fix #155
116 files changed, 128 insertions, 131 deletions
@@ -20,7 +20,7 @@ dependencies = [ [[package]] name = "annotate-snippets" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -131,7 +131,7 @@ name = "dhall" version = "0.4.0" dependencies = [ "abnf_to_pest 0.2.0", - "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "annotate-snippets 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1310,7 +1310,7 @@ dependencies = [ [metadata] "checksum abnf 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47feb9fbcef700639ef28e04ca2a87eab8161a01a075ee227b15c90143805462" -"checksum annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" +"checksum annotate-snippets 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aba2d96b8c8b5e656ad7ffb0d09f57772f10a1db74c8d23fca0ec695b38a4047" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml index bd91a1a..0ffe78b 100644 --- a/dhall/Cargo.toml +++ b/dhall/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" build = "build.rs" [dependencies] -annotate-snippets = "0.6.1" +annotate-snippets = "0.7.0" itertools = "0.9.0" hex = "0.4.2" lazy_static = "1.4.0" diff --git a/dhall/src/error/builder.rs b/dhall/src/error/builder.rs index f444518..c0bacb5 100644 --- a/dhall/src/error/builder.rs +++ b/dhall/src/error/builder.rs @@ -1,6 +1,5 @@ use annotate_snippets::{ display_list::DisplayList, - formatter::DisplayListFormatter, snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation}, }; @@ -152,10 +151,9 @@ impl ErrorBuilder { title: Some(this.title.into_annotation()), slices, footer, + opt: Default::default(), }; - let dl = DisplayList::from(snippet); - let dlf = DisplayListFormatter::new(true, false); - dlf.format(&dl) + DisplayList::from(snippet).to_string() } } diff --git a/dhall/src/syntax/ast/span.rs b/dhall/src/syntax/ast/span.rs index 153a624..2e09863 100644 --- a/dhall/src/syntax/ast/span.rs +++ b/dhall/src/syntax/ast/span.rs @@ -75,19 +75,15 @@ impl Span { } /// Convert a byte idx into a string into a char idx for consumption by annotate_snippets. +/// The byte idx must be at a char boundary. fn char_idx_from_byte_idx(input: &str, idx: usize) -> usize { - let char_idx = input + use std::iter::once; + input .char_indices() + .map(|(byte_i, _)| byte_i) // We don't care about the char + .chain(once(input.len())) // In case the idx points to the end of the string .enumerate() - .find(|(_, (i, _))| *i == idx) - .map(|(i, (_, _))| i) - // We should be able to unwrap() here, but somehow it panics on an example from - // serde_dhall/lib.rs... - .unwrap_or(0); - // Unix-style newlines are counted as two chars (see - // https://github.com/rust-lang/annotate-snippets-rs/issues/24). - let nbr_newlines = input[..idx].chars().filter(|c| *c == '\n').count(); - let nbr_carriage_returns = - input[..idx].chars().filter(|c| *c == '\r').count(); - char_idx + nbr_newlines - nbr_carriage_returns + .find(|(_, byte_i)| *byte_i == idx) + .map(|(char_i, _)| char_i) + .unwrap() } diff --git a/dhall/tests/import/failure/importBoundary.txt b/dhall/tests/import/failure/importBoundary.txt index 6f0615d..56810e2 100644 --- a/dhall/tests/import/failure/importBoundary.txt +++ b/dhall/tests/import/failure/importBoundary.txt @@ -1,5 +1,5 @@ Type error: error: unbound variable `x` - --> <current file>:1:0 + --> <current file>:1:1 | ... 3 | x diff --git a/dhall/tests/type-inference/failure/SortInLet.txt b/dhall/tests/type-inference/failure/SortInLet.txt index 19bd26d..1f38c3e 100644 --- a/dhall/tests/type-inference/failure/SortInLet.txt +++ b/dhall/tests/type-inference/failure/SortInLet.txt @@ -1,5 +1,5 @@ Type error: error: Sort does not have a type - --> <current file>:1:8 + --> <current file>:1:9 | 1 | let x = Sort in 0 | ^^^^ Sort does not have a type diff --git a/dhall/tests/type-inference/failure/hurkensParadox.txt b/dhall/tests/type-inference/failure/hurkensParadox.txt index 5aacb80..ec641c9 100644 --- a/dhall/tests/type-inference/failure/hurkensParadox.txt +++ b/dhall/tests/type-inference/failure/hurkensParadox.txt @@ -1,5 +1,5 @@ Type error: error: wrong type of function argument - --> <current file>:6:15 + --> <current file>:6:16 | 1 | let bottom : Type = ∀(any : Type) → any 2 | diff --git a/dhall/tests/type-inference/failure/mixedUnions.txt b/dhall/tests/type-inference/failure/mixedUnions.txt index 8e0026d..a6ca913 100644 --- a/dhall/tests/type-inference/failure/mixedUnions.txt +++ b/dhall/tests/type-inference/failure/mixedUnions.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < Left : Natural | Right : Type > | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/recordOfKind.txt b/dhall/tests/type-inference/failure/recordOfKind.txt index 653fe0b..7dcbe4f 100644 --- a/dhall/tests/type-inference/failure/recordOfKind.txt +++ b/dhall/tests/type-inference/failure/recordOfKind.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { a = Kind } | ^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldName.txt b/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldName.txt index a39a0fb..6f9bfc1 100644 --- a/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldName.txt +++ b/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldName.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { x : Natural } != { y : Natural } - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x = 1 } : { y : Natural } | ^^^^^^^^^ annot mismatch: { x : Natural } != { y : Natural } diff --git a/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldType.txt b/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldType.txt index 9ecc2a4..36f05d8 100644 --- a/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldType.txt +++ b/dhall/tests/type-inference/failure/unit/AnnotationRecordWrongFieldType.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { x : Natural } != { x : Text } - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x = 1 } : { x : Text } | ^^^^^^^^^ annot mismatch: { x : Natural } != { x : Text } diff --git a/dhall/tests/type-inference/failure/unit/AssertAlphaTrap.txt b/dhall/tests/type-inference/failure/unit/AssertAlphaTrap.txt index 7e27d00..0798b19 100644 --- a/dhall/tests/type-inference/failure/unit/AssertAlphaTrap.txt +++ b/dhall/tests/type-inference/failure/unit/AssertAlphaTrap.txt @@ -1,5 +1,5 @@ Type error: error: unbound variable ``_`` - --> <current file>:1:46 + --> <current file>:1:47 | 1 | assert : (\(_: Bool) -> _) === (\(x: Bool) -> _) | ^ not found in this scope diff --git a/dhall/tests/type-inference/failure/unit/AssertDoubleZeros.txt b/dhall/tests/type-inference/failure/unit/AssertDoubleZeros.txt index 12231a0..2606a9a 100644 --- a/dhall/tests/type-inference/failure/unit/AssertDoubleZeros.txt +++ b/dhall/tests/type-inference/failure/unit/AssertDoubleZeros.txt @@ -1,5 +1,5 @@ Type error: error: AssertMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | assert : -0.0 ≡ +0.0 | ^^^^^^^^^^^^^^^^^^^^ AssertMismatch diff --git a/dhall/tests/type-inference/failure/unit/AssertNotEquivalence.txt b/dhall/tests/type-inference/failure/unit/AssertNotEquivalence.txt index 5973d19..99ac828 100644 --- a/dhall/tests/type-inference/failure/unit/AssertNotEquivalence.txt +++ b/dhall/tests/type-inference/failure/unit/AssertNotEquivalence.txt @@ -1,5 +1,5 @@ Type error: error: AssertMustTakeEquivalence - --> <current file>:1:0 + --> <current file>:1:1 | 1 | assert : Bool | ^^^^^^^^^^^^^ AssertMustTakeEquivalence diff --git a/dhall/tests/type-inference/failure/unit/AssertTriviallyFalse.txt b/dhall/tests/type-inference/failure/unit/AssertTriviallyFalse.txt index 5742022..327a5d8 100644 --- a/dhall/tests/type-inference/failure/unit/AssertTriviallyFalse.txt +++ b/dhall/tests/type-inference/failure/unit/AssertTriviallyFalse.txt @@ -1,5 +1,5 @@ Type error: error: AssertMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | assert : 1 === 2 | ^^^^^^^^^^^^^^^^ AssertMismatch diff --git a/dhall/tests/type-inference/failure/unit/CompletionMissingRequiredField.txt b/dhall/tests/type-inference/failure/unit/CompletionMissingRequiredField.txt index 7a4a12c..fb1eb38 100644 --- a/dhall/tests/type-inference/failure/unit/CompletionMissingRequiredField.txt +++ b/dhall/tests/type-inference/failure/unit/CompletionMissingRequiredField.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { id : Optional Natural } != { id : Optional Natural, name : Text } - --> <current file>:1:4 + --> <current file>:1:5 | ... 6 | in Example::{=} diff --git a/dhall/tests/type-inference/failure/unit/CompletionWithWrongDefaultType.txt b/dhall/tests/type-inference/failure/unit/CompletionWithWrongDefaultType.txt index 9235ed4..cf6863d 100644 --- a/dhall/tests/type-inference/failure/unit/CompletionWithWrongDefaultType.txt +++ b/dhall/tests/type-inference/failure/unit/CompletionWithWrongDefaultType.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { id : Optional Natural, name : Bool } != { id : Optional Natural, name : Text } - --> <current file>:1:4 + --> <current file>:1:5 | ... 6 | in Example::{=} diff --git a/dhall/tests/type-inference/failure/unit/CompletionWithWrongFieldName.txt b/dhall/tests/type-inference/failure/unit/CompletionWithWrongFieldName.txt index 6a6cd1e..69be855 100644 --- a/dhall/tests/type-inference/failure/unit/CompletionWithWrongFieldName.txt +++ b/dhall/tests/type-inference/failure/unit/CompletionWithWrongFieldName.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { id : Optional Natural, nam : Text, name : Text } != { id : Optional Natural, name : Text } - --> <current file>:1:4 + --> <current file>:1:5 | ... 6 | in Example::{ nam = "John Doe" } diff --git a/dhall/tests/type-inference/failure/unit/CompletionWithWrongOverridenType.txt b/dhall/tests/type-inference/failure/unit/CompletionWithWrongOverridenType.txt index b4fe726..a663d0c 100644 --- a/dhall/tests/type-inference/failure/unit/CompletionWithWrongOverridenType.txt +++ b/dhall/tests/type-inference/failure/unit/CompletionWithWrongOverridenType.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: { id : Optional Natural, name : Bool } != { id : Optional Natural, name : Text } - --> <current file>:1:4 + --> <current file>:1:5 | ... 6 | in Example::{ name = True } diff --git a/dhall/tests/type-inference/failure/unit/EmptyToMap.txt b/dhall/tests/type-inference/failure/unit/EmptyToMap.txt index 000fac7..f3a5cca 100644 --- a/dhall/tests/type-inference/failure/unit/EmptyToMap.txt +++ b/dhall/tests/type-inference/failure/unit/EmptyToMap.txt @@ -1,5 +1,5 @@ Type error: error: `toMap` applied to an empty record requires a type annotation - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap {=} | ^^^^^^^^^ `toMap` applied to an empty record requires a type annotation diff --git a/dhall/tests/type-inference/failure/unit/EquivalenceNotSameType.txt b/dhall/tests/type-inference/failure/unit/EquivalenceNotSameType.txt index 12e21e4..d0d0489 100644 --- a/dhall/tests/type-inference/failure/unit/EquivalenceNotSameType.txt +++ b/dhall/tests/type-inference/failure/unit/EquivalenceNotSameType.txt @@ -1,5 +1,5 @@ Type error: error: EquivalenceTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 === False | ^^^^^^^^^^^ EquivalenceTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/EquivalenceNotTerms.txt b/dhall/tests/type-inference/failure/unit/EquivalenceNotTerms.txt index 0183c60..823c513 100644 --- a/dhall/tests/type-inference/failure/unit/EquivalenceNotTerms.txt +++ b/dhall/tests/type-inference/failure/unit/EquivalenceNotTerms.txt @@ -1,5 +1,5 @@ Type error: error: EquivalenceArgumentsMustBeTerms - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Bool === Bool | ^^^^^^^^^^^^^ EquivalenceArgumentsMustBeTerms diff --git a/dhall/tests/type-inference/failure/unit/FunctionApplicationArgumentNotMatch.txt b/dhall/tests/type-inference/failure/unit/FunctionApplicationArgumentNotMatch.txt index 07278b8..e70bbe0 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionApplicationArgumentNotMatch.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionApplicationArgumentNotMatch.txt @@ -1,5 +1,5 @@ Type error: error: wrong type of function argument - --> <current file>:1:1 + --> <current file>:1:2 | 1 | (λ(_ : Natural) → _) True | ^^^^^^^^^^^^^^^^^^ this expects an argument of type: Natural diff --git a/dhall/tests/type-inference/failure/unit/FunctionApplicationIsNotFunction.txt b/dhall/tests/type-inference/failure/unit/FunctionApplicationIsNotFunction.txt index e46904a..bddf096 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionApplicationIsNotFunction.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionApplicationIsNotFunction.txt @@ -1,5 +1,5 @@ Type error: error: expected function, found `Bool` - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True True | ^^^^ function application requires a function diff --git a/dhall/tests/type-inference/failure/unit/FunctionArgumentTypeNotAType.txt b/dhall/tests/type-inference/failure/unit/FunctionArgumentTypeNotAType.txt index ca5bbcd..2ffcd8b 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionArgumentTypeNotAType.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionArgumentTypeNotAType.txt @@ -1,5 +1,5 @@ Type error: error: Expected a type, found: `1` - --> <current file>:1:6 + --> <current file>:1:7 | 1 | λ(_ : 1) → _ | ^ this has type: `Natural` diff --git a/dhall/tests/type-inference/failure/unit/FunctionTypeArgumentTypeNotAType.txt b/dhall/tests/type-inference/failure/unit/FunctionTypeArgumentTypeNotAType.txt index 168ebb9..0cc7b4d 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionTypeArgumentTypeNotAType.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionTypeArgumentTypeNotAType.txt @@ -1,5 +1,5 @@ Type error: error: Expected a type, found: `2` - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 2 → _ | ^ this has type: `Natural` diff --git a/dhall/tests/type-inference/failure/unit/FunctionTypeKindSort.txt b/dhall/tests/type-inference/failure/unit/FunctionTypeKindSort.txt index 6f26607..7d4a140 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionTypeKindSort.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionTypeKindSort.txt @@ -1,5 +1,5 @@ Type error: error: Sort does not have a type - --> <current file>:1:7 + --> <current file>:1:8 | 1 | Kind → Sort | ^^^^ Sort does not have a type diff --git a/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.txt b/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.txt index bcc44a5..d335b63 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.txt @@ -1,5 +1,5 @@ Type error: error: Expected a type, found: `1` - --> <current file>:1:8 + --> <current file>:1:9 | 1 | Bool -> 1 | ^ this has type: `Natural` diff --git a/dhall/tests/type-inference/failure/unit/FunctionTypeTypeSort.txt b/dhall/tests/type-inference/failure/unit/FunctionTypeTypeSort.txt index 169014b..f377b54 100644 --- a/dhall/tests/type-inference/failure/unit/FunctionTypeTypeSort.txt +++ b/dhall/tests/type-inference/failure/unit/FunctionTypeTypeSort.txt @@ -1,5 +1,5 @@ Type error: error: Sort does not have a type - --> <current file>:1:7 + --> <current file>:1:8 | 1 | Type → Sort | ^^^^ Sort does not have a type diff --git a/dhall/tests/type-inference/failure/unit/HeterogenousToMap.txt b/dhall/tests/type-inference/failure/unit/HeterogenousToMap.txt index 2f8abf2..75c9f3d 100644 --- a/dhall/tests/type-inference/failure/unit/HeterogenousToMap.txt +++ b/dhall/tests/type-inference/failure/unit/HeterogenousToMap.txt @@ -1,5 +1,5 @@ Type error: error: Every field of the record must have the same type - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { foo= 1, bar= "Bar" } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Every field of the record must have the same type diff --git a/dhall/tests/type-inference/failure/unit/IfBranchesNotMatch.txt b/dhall/tests/type-inference/failure/unit/IfBranchesNotMatch.txt index d58af95..b27c37f 100644 --- a/dhall/tests/type-inference/failure/unit/IfBranchesNotMatch.txt +++ b/dhall/tests/type-inference/failure/unit/IfBranchesNotMatch.txt @@ -1,5 +1,5 @@ Type error: error: IfBranchMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | if True then 1 else "" | ^^^^^^^^^^^^^^^^^^^^^^ IfBranchMismatch diff --git a/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt b/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt index b70ac5f..4c9ec28 100644 --- a/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt +++ b/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt @@ -1,5 +1,5 @@ Type error: error: IfBranchMustBeTerm - --> <current file>:1:0 + --> <current file>:1:1 | 1 | if True then Type else Type | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTerm diff --git a/dhall/tests/type-inference/failure/unit/IfNotBool.txt b/dhall/tests/type-inference/failure/unit/IfNotBool.txt index eb5ff42..1b1560b 100644 --- a/dhall/tests/type-inference/failure/unit/IfNotBool.txt +++ b/dhall/tests/type-inference/failure/unit/IfNotBool.txt @@ -1,5 +1,5 @@ Type error: error: InvalidPredicate - --> <current file>:1:0 + --> <current file>:1:1 | 1 | if 1 then 1 else 1 | ^^^^^^^^^^^^^^^^^^ InvalidPredicate diff --git a/dhall/tests/type-inference/failure/unit/LetInSort.txt b/dhall/tests/type-inference/failure/unit/LetInSort.txt index 07be298..529c78e 100644 --- a/dhall/tests/type-inference/failure/unit/LetInSort.txt +++ b/dhall/tests/type-inference/failure/unit/LetInSort.txt @@ -1,5 +1,5 @@ Type error: error: Sort does not have a type - --> <current file>:1:18 + --> <current file>:1:19 | 1 | \(x: let x = 0 in Sort) -> 1 | ^^^^ Sort does not have a type diff --git a/dhall/tests/type-inference/failure/unit/LetWithWrongAnnotation.txt b/dhall/tests/type-inference/failure/unit/LetWithWrongAnnotation.txt index 51279f2..bb4ac84 100644 --- a/dhall/tests/type-inference/failure/unit/LetWithWrongAnnotation.txt +++ b/dhall/tests/type-inference/failure/unit/LetWithWrongAnnotation.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: Bool != Natural - --> <current file>:1:18 + --> <current file>:1:19 | 1 | let x : Natural = True in True | ^^^^ annot mismatch: Bool != Natural diff --git a/dhall/tests/type-inference/failure/unit/ListLiteralEmptyNotType.txt b/dhall/tests/type-inference/failure/unit/ListLiteralEmptyNotType.txt index 2ca5819..ebe2c26 100644 --- a/dhall/tests/type-inference/failure/unit/ListLiteralEmptyNotType.txt +++ b/dhall/tests/type-inference/failure/unit/ListLiteralEmptyNotType.txt @@ -1,5 +1,5 @@ Type error: error: wrong type of function argument - --> <current file>:1:5 + --> <current file>:1:6 | 1 | [] : List Type | ^^^^ this expects an argument of type: Type diff --git a/dhall/tests/type-inference/failure/unit/ListLiteralNotType.txt b/dhall/tests/type-inference/failure/unit/ListLiteralNotType.txt index 62d69e5..7454433 100644 --- a/dhall/tests/type-inference/failure/unit/ListLiteralNotType.txt +++ b/dhall/tests/type-inference/failure/unit/ListLiteralNotType.txt @@ -1,5 +1,5 @@ Type error: error: InvalidListType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [ Bool ] | ^^^^^^^^ InvalidListType diff --git a/dhall/tests/type-inference/failure/unit/ListLiteralTypesNotMatch.txt b/dhall/tests/type-inference/failure/unit/ListLiteralTypesNotMatch.txt index 33e007d..495c88c 100644 --- a/dhall/tests/type-inference/failure/unit/ListLiteralTypesNotMatch.txt +++ b/dhall/tests/type-inference/failure/unit/ListLiteralTypesNotMatch.txt @@ -1,5 +1,5 @@ Type error: error: InvalidListElement - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [ True, 1 ] | ^^^^^^^^^^^ InvalidListElement diff --git a/dhall/tests/type-inference/failure/unit/MergeAlternativeHasNoHandler.txt b/dhall/tests/type-inference/failure/unit/MergeAlternativeHasNoHandler.txt index a4a967a..bd121e6 100644 --- a/dhall/tests/type-inference/failure/unit/MergeAlternativeHasNoHandler.txt +++ b/dhall/tests/type-inference/failure/unit/MergeAlternativeHasNoHandler.txt @@ -1,5 +1,5 @@ Type error: error: MergeVariantMissingHandler - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge {=} (< x : Bool >.x True) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler diff --git a/dhall/tests/type-inference/failure/unit/MergeAnnotationMismatch.txt b/dhall/tests/type-inference/failure/unit/MergeAnnotationMismatch.txt index 9175f33..7c93b44 100644 --- a/dhall/tests/type-inference/failure/unit/MergeAnnotationMismatch.txt +++ b/dhall/tests/type-inference/failure/unit/MergeAnnotationMismatch.txt @@ -1,5 +1,5 @@ Type error: error: MergeAnnotMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = 0 } < x >.x : Bool | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeAnnotMismatch diff --git a/dhall/tests/type-inference/failure/unit/MergeAnnotationNotType.txt b/dhall/tests/type-inference/failure/unit/MergeAnnotationNotType.txt index 1173f0c..22b8667 100644 --- a/dhall/tests/type-inference/failure/unit/MergeAnnotationNotType.txt +++ b/dhall/tests/type-inference/failure/unit/MergeAnnotationNotType.txt @@ -1,5 +1,5 @@ Type error: error: Merge2ArgMustBeUnionOrOptional - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge {=} <> : Type | ^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional diff --git a/dhall/tests/type-inference/failure/unit/MergeBool.txt b/dhall/tests/type-inference/failure/unit/MergeBool.txt index 209def1..7ecdcb9 100644 --- a/dhall/tests/type-inference/failure/unit/MergeBool.txt +++ b/dhall/tests/type-inference/failure/unit/MergeBool.txt @@ -1,5 +1,5 @@ Type error: error: Merge2ArgMustBeUnionOrOptional - --> <current file>:1:43 + --> <current file>:1:44 | 1 | \(x: { True: Natural, False: Natural }) -> merge x True | ^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional diff --git a/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation1.txt b/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation1.txt index 94442e0..1741739 100644 --- a/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation1.txt +++ b/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation1.txt @@ -1,5 +1,5 @@ Type error: error: MergeEmptyNeedsAnnotation - --> <current file>:1:13 + --> <current file>:1:14 | 1 | \(x: <>) -> (merge {=} x) : Bool | ^^^^^^^^^^^ MergeEmptyNeedsAnnotation diff --git a/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation2.txt b/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation2.txt index 5dcffdf..fedd3b2 100644 --- a/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation2.txt +++ b/dhall/tests/type-inference/failure/unit/MergeEmptyNeedsDirectAnnotation2.txt @@ -1,5 +1,5 @@ Type error: error: MergeEmptyNeedsAnnotation - --> <current file>:1:26 + --> <current file>:1:27 | 1 | \(x: <>) -> let y: Bool = merge {=} x in 1 | ^^^^^^^^^^^ MergeEmptyNeedsAnnotation diff --git a/dhall/tests/type-inference/failure/unit/MergeEmptyWithoutAnnotation.txt b/dhall/tests/type-inference/failure/unit/MergeEmptyWithoutAnnotation.txt index bf45123..5f5181c 100644 --- a/dhall/tests/type-inference/failure/unit/MergeEmptyWithoutAnnotation.txt +++ b/dhall/tests/type-inference/failure/unit/MergeEmptyWithoutAnnotation.txt @@ -1,5 +1,5 @@ Type error: error: Merge2ArgMustBeUnionOrOptional - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge {=} <> | ^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional diff --git a/dhall/tests/type-inference/failure/unit/MergeHandlerNotFunction.txt b/dhall/tests/type-inference/failure/unit/MergeHandlerNotFunction.txt index 8528f90..83f1b90 100644 --- a/dhall/tests/type-inference/failure/unit/MergeHandlerNotFunction.txt +++ b/dhall/tests/type-inference/failure/unit/MergeHandlerNotFunction.txt @@ -1,5 +1,5 @@ Type error: error: merge handler is not a function - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = True } (< x : Bool >.x True) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this merge expression diff --git a/dhall/tests/type-inference/failure/unit/MergeHandlerNotInUnion.txt b/dhall/tests/type-inference/failure/unit/MergeHandlerNotInUnion.txt index 3159340..51456ed 100644 --- a/dhall/tests/type-inference/failure/unit/MergeHandlerNotInUnion.txt +++ b/dhall/tests/type-inference/failure/unit/MergeHandlerNotInUnion.txt @@ -1,5 +1,5 @@ Type error: error: Merge2ArgMustBeUnionOrOptional - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = λ(_ : Bool) → _ } <> : Bool | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional diff --git a/dhall/tests/type-inference/failure/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-inference/failure/unit/MergeHandlerNotMatchAlternativeType.txt index c2229bd..34f968f 100644 --- a/dhall/tests/type-inference/failure/unit/MergeHandlerNotMatchAlternativeType.txt +++ b/dhall/tests/type-inference/failure/unit/MergeHandlerNotMatchAlternativeType.txt @@ -1,5 +1,5 @@ Type error: error: Wrong handler input type - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this merge expression diff --git a/dhall/tests/type-inference/failure/unit/MergeHandlersWithDifferentType.txt b/dhall/tests/type-inference/failure/unit/MergeHandlersWithDifferentType.txt index 47f3de7..f3d8fd2 100644 --- a/dhall/tests/type-inference/failure/unit/MergeHandlersWithDifferentType.txt +++ b/dhall/tests/type-inference/failure/unit/MergeHandlersWithDifferentType.txt @@ -1,5 +1,5 @@ Type error: error: MergeHandlerTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = λ(_ : Bool) → _, y = λ(_ : Natural) → _ } (< x : Bool | y : Natural >.x True) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/MergeLhsNotRecord.txt b/dhall/tests/type-inference/failure/unit/MergeLhsNotRecord.txt index f27dddd..5e4415f 100644 --- a/dhall/tests/type-inference/failure/unit/MergeLhsNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/MergeLhsNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: Merge1ArgMustBeRecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge True < x >.x | ^^^^^^^^^^^^^^^^^^ Merge1ArgMustBeRecord diff --git a/dhall/tests/type-inference/failure/unit/MergeMissingHandler1.txt b/dhall/tests/type-inference/failure/unit/MergeMissingHandler1.txt index af58d05..b3ec2ff 100644 --- a/dhall/tests/type-inference/failure/unit/MergeMissingHandler1.txt +++ b/dhall/tests/type-inference/failure/unit/MergeMissingHandler1.txt @@ -1,5 +1,5 @@ Type error: error: MergeVariantMissingHandler - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge {=} <x>.x | ^^^^^^^^^^^^^^^ MergeVariantMissingHandler diff --git a/dhall/tests/type-inference/failure/unit/MergeMissingHandler2.txt b/dhall/tests/type-inference/failure/unit/MergeMissingHandler2.txt index 49484df..f98924d 100644 --- a/dhall/tests/type-inference/failure/unit/MergeMissingHandler2.txt +++ b/dhall/tests/type-inference/failure/unit/MergeMissingHandler2.txt @@ -1,5 +1,5 @@ Type error: error: MergeVariantMissingHandler - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = 0 } <x | y>.x | ^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler diff --git a/dhall/tests/type-inference/failure/unit/MergeRhsNotUnion.txt b/dhall/tests/type-inference/failure/unit/MergeRhsNotUnion.txt index 0108725..ffa6387 100644 --- a/dhall/tests/type-inference/failure/unit/MergeRhsNotUnion.txt +++ b/dhall/tests/type-inference/failure/unit/MergeRhsNotUnion.txt @@ -1,5 +1,5 @@ Type error: error: Merge2ArgMustBeUnionOrOptional - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge {=} True | ^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional diff --git a/dhall/tests/type-inference/failure/unit/MergeUnusedHandler.txt b/dhall/tests/type-inference/failure/unit/MergeUnusedHandler.txt index 2afe376..12abd94 100644 --- a/dhall/tests/type-inference/failure/unit/MergeUnusedHandler.txt +++ b/dhall/tests/type-inference/failure/unit/MergeUnusedHandler.txt @@ -1,5 +1,5 @@ Type error: error: MergeHandlerMissingVariant - --> <current file>:1:0 + --> <current file>:1:1 | 1 | merge { x = 1, y = 2 } < x >.x | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerMissingVariant diff --git a/dhall/tests/type-inference/failure/unit/MistypedToMap1.txt b/dhall/tests/type-inference/failure/unit/MistypedToMap1.txt index 14d9791..a5fce09 100644 --- a/dhall/tests/type-inference/failure/unit/MistypedToMap1.txt +++ b/dhall/tests/type-inference/failure/unit/MistypedToMap1.txt @@ -1,5 +1,5 @@ Type error: error: Annotation mismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { foo= 1, bar= 4 } : Natural | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch diff --git a/dhall/tests/type-inference/failure/unit/MistypedToMap2.txt b/dhall/tests/type-inference/failure/unit/MistypedToMap2.txt index 88e303e..5b3e94c 100644 --- a/dhall/tests/type-inference/failure/unit/MistypedToMap2.txt +++ b/dhall/tests/type-inference/failure/unit/MistypedToMap2.txt @@ -1,5 +1,5 @@ Type error: error: Annotation mismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { foo= 1, bar= 4 } : List Natural | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch diff --git a/dhall/tests/type-inference/failure/unit/MistypedToMap3.txt b/dhall/tests/type-inference/failure/unit/MistypedToMap3.txt index 6b3772d..7be0766 100644 --- a/dhall/tests/type-inference/failure/unit/MistypedToMap3.txt +++ b/dhall/tests/type-inference/failure/unit/MistypedToMap3.txt @@ -1,5 +1,5 @@ Type error: error: Annotation mismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { foo= 1, bar= 4 } : List { mapKey : Natural, mapValue : Natural } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch diff --git a/dhall/tests/type-inference/failure/unit/MistypedToMap4.txt b/dhall/tests/type-inference/failure/unit/MistypedToMap4.txt index e0cf651..45b7552 100644 --- a/dhall/tests/type-inference/failure/unit/MistypedToMap4.txt +++ b/dhall/tests/type-inference/failure/unit/MistypedToMap4.txt @@ -1,5 +1,5 @@ Type error: error: Annotation mismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { foo= 1, bar= 4 } : List { mapKey : Text, mapValue : Text } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch diff --git a/dhall/tests/type-inference/failure/unit/NaturalSubtractNotNatural.txt b/dhall/tests/type-inference/failure/unit/NaturalSubtractNotNatural.txt index ac336a6..45ccd2f 100644 --- a/dhall/tests/type-inference/failure/unit/NaturalSubtractNotNatural.txt +++ b/dhall/tests/type-inference/failure/unit/NaturalSubtractNotNatural.txt @@ -1,5 +1,5 @@ Type error: error: wrong type of function argument - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Natural/subtract True True | ^^^^^^^^^^^^^^^^ this expects an argument of type: Natural diff --git a/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.txt b/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.txt index b56db54..750a8cf 100644 --- a/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.txt +++ b/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: Natural != Bool - --> <current file>:1:1 + --> <current file>:1:2 | 1 | (0 : Bool) : Natural | ^ annot mismatch: Natural != Bool diff --git a/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.txt b/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.txt index 2f07b8d..f700201 100644 --- a/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.txt +++ b/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: Natural != Bool - --> <current file>:1:1 + --> <current file>:1:2 | 1 | (0 : Natural) : Bool | ^^^^^^^^^^^ annot mismatch: Natural != Bool diff --git a/dhall/tests/type-inference/failure/unit/NonRecordToMap.txt b/dhall/tests/type-inference/failure/unit/NonRecordToMap.txt index 8e83002..cf764c3 100644 --- a/dhall/tests/type-inference/failure/unit/NonRecordToMap.txt +++ b/dhall/tests/type-inference/failure/unit/NonRecordToMap.txt @@ -1,5 +1,5 @@ Type error: error: The argument to `toMap` must be a record - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap "text" | ^^^^^^^^^^^^ The argument to `toMap` must be a record diff --git a/dhall/tests/type-inference/failure/unit/OperatorAndNotBool.txt b/dhall/tests/type-inference/failure/unit/OperatorAndNotBool.txt index f6ea50b..a8743d6 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorAndNotBool.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorAndNotBool.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 && 1 | ^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorEqualNotBool.txt b/dhall/tests/type-inference/failure/unit/OperatorEqualNotBool.txt index 8662c16..9223805 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorEqualNotBool.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorEqualNotBool.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 == 1 | ^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateLhsNotList.txt b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateLhsNotList.txt index 8075b99..57ce7a2 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateLhsNotList.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateLhsNotList.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 # [ True ] | ^^^^^^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateListsNotMatch.txt b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateListsNotMatch.txt index 9e404f8..5d39cd0 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateListsNotMatch.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateListsNotMatch.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [ True ] # [ 1 ] | ^^^^^^^^^^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateNotListsButMatch.txt b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateNotListsButMatch.txt index fffc898..0b21ff1 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateNotListsButMatch.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateNotListsButMatch.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 # 2 | ^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateRhsNotList.txt b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateRhsNotList.txt index 2ba0b91..afa5d0f 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorListConcatenateRhsNotList.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorListConcatenateRhsNotList.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [ True ] # 1 | ^^^^^^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorNotEqualNotBool.txt b/dhall/tests/type-inference/failure/unit/OperatorNotEqualNotBool.txt index ac04fd4..f5d371c 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorNotEqualNotBool.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorNotEqualNotBool.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 != 1 | ^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorOrNotBool.txt b/dhall/tests/type-inference/failure/unit/OperatorOrNotBool.txt index 9e1c4fb..851fe75 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorOrNotBool.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorOrNotBool.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 || 1 | ^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorPlusNotNatural.txt b/dhall/tests/type-inference/failure/unit/OperatorPlusNotNatural.txt index 97e0df4..8dec83f 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorPlusNotNatural.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorPlusNotNatural.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True + True | ^^^^^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateLhsNotText.txt b/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateLhsNotText.txt index 679d991..42a9e03 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateLhsNotText.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateLhsNotText.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 ++ "" | ^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateRhsNotText.txt b/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateRhsNotText.txt index 85611f7..5a5111d 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateRhsNotText.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorTextConcatenateRhsNotText.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | "" ++ 1 | ^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OperatorTimesNotNatural.txt b/dhall/tests/type-inference/failure/unit/OperatorTimesNotNatural.txt index d688ed6..b1619db 100644 --- a/dhall/tests/type-inference/failure/unit/OperatorTimesNotNatural.txt +++ b/dhall/tests/type-inference/failure/unit/OperatorTimesNotNatural.txt @@ -1,5 +1,5 @@ Type error: error: BinOpTypeMismatch - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True * True | ^^^^^^^^^^^ BinOpTypeMismatch diff --git a/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxAbsent.txt b/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxAbsent.txt index bfb36ae..10ceba6 100644 --- a/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxAbsent.txt +++ b/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxAbsent.txt @@ -1,5 +1,5 @@ Type error: error: InvalidListType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [] : Optional Bool | ^^^^^^^^^^^^^^^^^^ InvalidListType diff --git a/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxPresent.txt b/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxPresent.txt index 0cc4bba..a589287 100644 --- a/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxPresent.txt +++ b/dhall/tests/type-inference/failure/unit/OptionalDeprecatedSyntaxPresent.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: List Natural != Optional Natural - --> <current file>:1:0 + --> <current file>:1:1 | 1 | [ 1 ] : Optional Natural | ^^^^^ annot mismatch: List Natural != Optional Natural diff --git a/dhall/tests/type-inference/failure/unit/RecordMixedKinds3.txt b/dhall/tests/type-inference/failure/unit/RecordMixedKinds3.txt index 146018f..fa8b153 100644 --- a/dhall/tests/type-inference/failure/unit/RecordMixedKinds3.txt +++ b/dhall/tests/type-inference/failure/unit/RecordMixedKinds3.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x = Type, y = Kind } | ^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeFieldTypeMismatch.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeFieldTypeMismatch.txt index d624075..ba9d9cd 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeFieldTypeMismatch.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeFieldTypeMismatch.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionWrongType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { y = {=} }.( {y : Natural} ) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ProjectionWrongType diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeNotPresent.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeNotPresent.txt index c22c2c4..a300842 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeNotPresent.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionByTypeNotPresent.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionMissingEntry - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { y = {=} }.( {x : Natural} ) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ProjectionMissingEntry diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionDuplicateFields.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionDuplicateFields.txt index 5c6520b..05c3eed 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionDuplicateFields.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionDuplicateFields.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionDuplicateField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x = 1 }.{ x, x } | ^^^^^^^^^^^^^^^^^^ ProjectionDuplicateField diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionEmpty.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionEmpty.txt index 39f263b..6e8908b 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionEmpty.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionEmpty.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionMissingEntry - --> <current file>:1:0 + --> <current file>:1:1 | 1 | {=}.{ x } | ^^^^^^^^^ ProjectionMissingEntry diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionNotPresent.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionNotPresent.txt index 032f7a0..d209197 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionNotPresent.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionNotPresent.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionMissingEntry - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { y = {=} }.{ x } | ^^^^^^^^^^^^^^^^^ ProjectionMissingEntry diff --git a/dhall/tests/type-inference/failure/unit/RecordProjectionNotRecord.txt b/dhall/tests/type-inference/failure/unit/RecordProjectionNotRecord.txt index 5ed6ffd..4571d07 100644 --- a/dhall/tests/type-inference/failure/unit/RecordProjectionNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RecordProjectionNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: ProjectionMustBeRecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True.{ x } | ^^^^^^^^^^ ProjectionMustBeRecord diff --git a/dhall/tests/type-inference/failure/unit/RecordSelectionEmpty.txt b/dhall/tests/type-inference/failure/unit/RecordSelectionEmpty.txt index 5b3b7f8..ec45a13 100644 --- a/dhall/tests/type-inference/failure/unit/RecordSelectionEmpty.txt +++ b/dhall/tests/type-inference/failure/unit/RecordSelectionEmpty.txt @@ -1,5 +1,5 @@ Type error: error: MissingRecordField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | {=}.x | ^^^^^ MissingRecordField diff --git a/dhall/tests/type-inference/failure/unit/RecordSelectionNotPresent.txt b/dhall/tests/type-inference/failure/unit/RecordSelectionNotPresent.txt index d435ca0..6701dd6 100644 --- a/dhall/tests/type-inference/failure/unit/RecordSelectionNotPresent.txt +++ b/dhall/tests/type-inference/failure/unit/RecordSelectionNotPresent.txt @@ -1,5 +1,5 @@ Type error: error: MissingRecordField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { y = {=} }.x | ^^^^^^^^^^^^^ MissingRecordField diff --git a/dhall/tests/type-inference/failure/unit/RecordSelectionNotRecord.txt b/dhall/tests/type-inference/failure/unit/RecordSelectionNotRecord.txt index 3f9b7ed..a2eec86 100644 --- a/dhall/tests/type-inference/failure/unit/RecordSelectionNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RecordSelectionNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: NotARecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True.x | ^^^^^^ NotARecord diff --git a/dhall/tests/type-inference/failure/unit/RecordSelectionTypeNotUnionType.txt b/dhall/tests/type-inference/failure/unit/RecordSelectionTypeNotUnionType.txt index cca28b8..0eaf58e 100644 --- a/dhall/tests/type-inference/failure/unit/RecordSelectionTypeNotUnionType.txt +++ b/dhall/tests/type-inference/failure/unit/RecordSelectionTypeNotUnionType.txt @@ -1,5 +1,5 @@ Type error: error: NotARecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Bool.x | ^^^^^^ NotARecord diff --git a/dhall/tests/type-inference/failure/unit/RecordTypeDuplicateFields.txt b/dhall/tests/type-inference/failure/unit/RecordTypeDuplicateFields.txt index 145a59b..d8bec44 100644 --- a/dhall/tests/type-inference/failure/unit/RecordTypeDuplicateFields.txt +++ b/dhall/tests/type-inference/failure/unit/RecordTypeDuplicateFields.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeDuplicateField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x: Natural, x: Natural } | ^^^^^^^^^^^^^^^^^^^^^^^^^^ RecordTypeDuplicateField diff --git a/dhall/tests/type-inference/failure/unit/RecordTypeValueMember.txt b/dhall/tests/type-inference/failure/unit/RecordTypeValueMember.txt index 04488ad..81815a2 100644 --- a/dhall/tests/type-inference/failure/unit/RecordTypeValueMember.txt +++ b/dhall/tests/type-inference/failure/unit/RecordTypeValueMember.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x : True } | ^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeLhsNotRecord.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeLhsNotRecord.txt index 02cf64f..8daaa9c 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeLhsNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeLhsNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True ∧ {=} | ^^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeOverlapping.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeOverlapping.txt index 202a3e5..ec01f0d 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeOverlapping.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeOverlapping.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x = True } ∧ { x = False } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeRhsNotRecord.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeRhsNotRecord.txt index a0b4676..3e87fde 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeRhsNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordMergeRhsNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | {=} ∧ True | ^^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt index b35e64b..c674a6f 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Bool ⩓ {} | ^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeOverlapping.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeOverlapping.txt index 769712b..97e175b 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeOverlapping.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeOverlapping.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | { x : Bool } ⩓ { x : Natural } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt index 0200f97..a62bab8 100644 --- a/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt +++ b/dhall/tests/type-inference/failure/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt @@ -1,5 +1,5 @@ Type error: error: RecordTypeMergeRequiresRecordType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | {} ⩓ Bool | ^^^^^^^^^ RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeLhsNotRecord.txt b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeLhsNotRecord.txt index 3b158ce..d693ccb 100644 --- a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeLhsNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeLhsNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: MustCombineRecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | True ⫽ {=} | ^^^^^^^^^^ MustCombineRecord diff --git a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds2.txt b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds2.txt index 521ae05..146bf7f 100644 --- a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds2.txt +++ b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds2.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:15 + --> <current file>:1:16 | 1 | { x = Bool } ⫽ { x = Kind } | ^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds3.txt b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds3.txt index 3abf62c..71914e1 100644 --- a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds3.txt +++ b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeMixedKinds3.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:14 + --> <current file>:1:15 | 1 | { x = {=} } ⫽ { x = Kind } | ^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeRhsNotRecord.txt b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeRhsNotRecord.txt index 4f9cb0d..1f3c675 100644 --- a/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeRhsNotRecord.txt +++ b/dhall/tests/type-inference/failure/unit/RightBiasedRecordMergeRhsNotRecord.txt @@ -1,5 +1,5 @@ Type error: error: MustCombineRecord - --> <current file>:1:0 + --> <current file>:1:1 | 1 | {=} ⫽ True | ^^^^^^^^^^ MustCombineRecord diff --git a/dhall/tests/type-inference/failure/unit/SomeNotType.txt b/dhall/tests/type-inference/failure/unit/SomeNotType.txt index 3584768..147e5b2 100644 --- a/dhall/tests/type-inference/failure/unit/SomeNotType.txt +++ b/dhall/tests/type-inference/failure/unit/SomeNotType.txt @@ -1,5 +1,5 @@ Type error: error: InvalidOptionalType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Some Bool | ^^^^^^^^^ InvalidOptionalType diff --git a/dhall/tests/type-inference/failure/unit/Sort.txt b/dhall/tests/type-inference/failure/unit/Sort.txt index e402127..daae359 100644 --- a/dhall/tests/type-inference/failure/unit/Sort.txt +++ b/dhall/tests/type-inference/failure/unit/Sort.txt @@ -1,5 +1,5 @@ Type error: error: Sort does not have a type - --> <current file>:1:0 + --> <current file>:1:1 | 1 | Sort | ^^^^ Sort does not have a type diff --git a/dhall/tests/type-inference/failure/unit/TextLiteralInterpolateNotText.txt b/dhall/tests/type-inference/failure/unit/TextLiteralInterpolateNotText.txt index 0132a30..213c212 100644 --- a/dhall/tests/type-inference/failure/unit/TextLiteralInterpolateNotText.txt +++ b/dhall/tests/type-inference/failure/unit/TextLiteralInterpolateNotText.txt @@ -1,5 +1,5 @@ Type error: error: InvalidTextInterpolation - --> <current file>:1:0 + --> <current file>:1:1 | 1 | "${1}" | ^^^^^^ InvalidTextInterpolation diff --git a/dhall/tests/type-inference/failure/unit/ToMapEmptyInvalidAnnotation.txt b/dhall/tests/type-inference/failure/unit/ToMapEmptyInvalidAnnotation.txt index c28073e..218ca9e 100644 --- a/dhall/tests/type-inference/failure/unit/ToMapEmptyInvalidAnnotation.txt +++ b/dhall/tests/type-inference/failure/unit/ToMapEmptyInvalidAnnotation.txt @@ -1,5 +1,5 @@ Type error: error: The type of `toMap x` must be of the form `List { mapKey : Text, mapValue : T }` - --> <current file>:2:0 + --> <current file>:2:1 | 1 | -- The mapKey must be Text 2 | toMap {=} : List { mapKey : Bool, mapValue : Text } diff --git a/dhall/tests/type-inference/failure/unit/ToMapWrongKind.txt b/dhall/tests/type-inference/failure/unit/ToMapWrongKind.txt index 8158c08..403672d 100644 --- a/dhall/tests/type-inference/failure/unit/ToMapWrongKind.txt +++ b/dhall/tests/type-inference/failure/unit/ToMapWrongKind.txt @@ -1,5 +1,5 @@ Type error: error: `toMap` only accepts records of type `Type` - --> <current file>:1:0 + --> <current file>:1:1 | 1 | toMap { x = Bool } | ^^^^^^^^^^^^^^^^^^ `toMap` only accepts records of type `Type` diff --git a/dhall/tests/type-inference/failure/unit/TypeAnnotationWrong.txt b/dhall/tests/type-inference/failure/unit/TypeAnnotationWrong.txt index dffadb1..32b58ef 100644 --- a/dhall/tests/type-inference/failure/unit/TypeAnnotationWrong.txt +++ b/dhall/tests/type-inference/failure/unit/TypeAnnotationWrong.txt @@ -1,5 +1,5 @@ Type error: error: annot mismatch: Natural != Bool - --> <current file>:1:0 + --> <current file>:1:1 | 1 | 1 : Bool | ^ annot mismatch: Natural != Bool diff --git a/dhall/tests/type-inference/failure/unit/UnionConstructorFieldNotPresent.txt b/dhall/tests/type-inference/failure/unit/UnionConstructorFieldNotPresent.txt index 41d283d..562e03c 100644 --- a/dhall/tests/type-inference/failure/unit/UnionConstructorFieldNotPresent.txt +++ b/dhall/tests/type-inference/failure/unit/UnionConstructorFieldNotPresent.txt @@ -1,5 +1,5 @@ Type error: error: MissingUnionField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < x : Bool >.y | ^^^^^^^^^^^^^^ MissingUnionField diff --git a/dhall/tests/type-inference/failure/unit/UnionDeprecatedConstructorsKeyword.txt b/dhall/tests/type-inference/failure/unit/UnionDeprecatedConstructorsKeyword.txt index 91fb96d..2ecb0a9 100644 --- a/dhall/tests/type-inference/failure/unit/UnionDeprecatedConstructorsKeyword.txt +++ b/dhall/tests/type-inference/failure/unit/UnionDeprecatedConstructorsKeyword.txt @@ -1,5 +1,5 @@ Type error: error: unbound variable `constructors` - --> <current file>:1:0 + --> <current file>:1:1 | 1 | constructors < Left : Natural | Right : Bool > | ^^^^^^^^^^^^ not found in this scope diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants1.txt b/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants1.txt index 7372641..84bfe4d 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants1.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants1.txt @@ -1,5 +1,5 @@ Type error: error: UnionTypeDuplicateField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | <x | x> | ^^^^^^^ UnionTypeDuplicateField diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants2.txt b/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants2.txt index 07042c2..eb20b12 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants2.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeDuplicateVariants2.txt @@ -1,5 +1,5 @@ Type error: error: UnionTypeDuplicateField - --> <current file>:1:0 + --> <current file>:1:1 | 1 | <x | x: Natural> | ^^^^^^^^^^^^^^^^ UnionTypeDuplicateField diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds.txt b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds.txt index 00e24b3..44ce7a3 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < x : Bool | y : Type > | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds2.txt b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds2.txt index 924b1e1..01f706d 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds2.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds2.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < x : Kind | y : Type > | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds3.txt b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds3.txt index 1113a0d..496462d 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds3.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeMixedKinds3.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < x : Kind | y : Bool > | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/UnionTypeNotType.txt b/dhall/tests/type-inference/failure/unit/UnionTypeNotType.txt index b2c06e0..450a3dd 100644 --- a/dhall/tests/type-inference/failure/unit/UnionTypeNotType.txt +++ b/dhall/tests/type-inference/failure/unit/UnionTypeNotType.txt @@ -1,5 +1,5 @@ Type error: error: InvalidFieldType - --> <current file>:1:0 + --> <current file>:1:1 | 1 | < x : True > | ^^^^^^^^^^^^ InvalidFieldType diff --git a/dhall/tests/type-inference/failure/unit/VariableFree.txt b/dhall/tests/type-inference/failure/unit/VariableFree.txt index db78e15..bd033e0 100644 --- a/dhall/tests/type-inference/failure/unit/VariableFree.txt +++ b/dhall/tests/type-inference/failure/unit/VariableFree.txt @@ -1,5 +1,5 @@ Type error: error: unbound variable `x` - --> <current file>:1:0 + --> <current file>:1:1 | 1 | x | ^ not found in this scope diff --git a/dhall/tests/type-inference/failure/unit/WithUnderscore.txt b/dhall/tests/type-inference/failure/unit/WithUnderscore.txt index 77b0777..468450f 100644 --- a/dhall/tests/type-inference/failure/unit/WithUnderscore.txt +++ b/dhall/tests/type-inference/failure/unit/WithUnderscore.txt @@ -1,5 +1,5 @@ Type error: error: unbound variable ``_`` - --> <current file>:1:23 + --> <current file>:1:24 | ... 5 | { a.b = 1 } with a.c = _ diff --git a/serde_dhall/tests/de.rs b/serde_dhall/tests/de.rs index 41a44bd..74912dd 100644 --- a/serde_dhall/tests/de.rs +++ b/serde_dhall/tests/de.rs @@ -82,4 +82,7 @@ fn test_de_untyped() { parse::<BTreeMap<String, usize>>("{ x = 1, y = 2 }"), expected_map ); + + // https://github.com/Nadrieril/dhall-rust/issues/155 + assert!(from_str::<bool>("List/length [True, 42]").is_err()); } |