Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Force combine upgrade for better errors #297

Merged
merged 1 commit into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ easy = ["serde"]

[dependencies]
indexmap = "1.7"
combine = "4.5.2"
combine = "4.6.3"
itertools = "0.10"
serde = { version = "1", features = ["derive"], optional = true }
kstring = { version = "1", features = ["max_inline"] }
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/empty-table.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 2
1 | []
| ^
Unexpected `]`
Expected `key`
Expected key
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/float-no-trailing-digits.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ TOML parse error at line 1, column 12
| ^
Unexpected `
`
Expected `digit`
Expected digit
While parsing a Float
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/float-underscore-after-point.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 9
1 | bad = 1._2
| ^
Unexpected `_`
Expected `digit`
Expected digit
While parsing a Float
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/float-underscore-after.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ TOML parse error at line 1, column 11
| ^
Unexpected `
`
Expected `digit`
Expected digit
While parsing a Float
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 9
1 | bad = 1_.2
| ^
Unexpected `.`
Expected `digit`
Expected digit
While parsing an Integer
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/inline-table-newline.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ TOML parse error at line 7, column 11
| ^
Unexpected `
`
Expected `key`
Expected key
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/integer-underscore-after.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ TOML parse error at line 1, column 11
| ^
Unexpected `
`
Expected `digit`
Expected digit
While parsing an Integer
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/integer-underscore-double.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 9
1 | bad = 1__23
| ^
Unexpected `_`
Expected `digit`
Expected digit
While parsing an Integer
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/key-after-array.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 14
1 | [[agencies]] owner = "S Cjelli"
| ^
Unexpected `o`
Expected `newline` or `end of input`
Expected newline or end of input
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/key-after-table.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 9
1 | [error] this = "should not be here"
| ^
Unexpected `t`
Expected `newline` or `end of input`
Expected newline or end of input
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/key-empty.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 2
1 | = 1
| ^
Unexpected `=`
Expected `key`
Expected key
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/key-no-eol.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 7
1 | a = 1 b = 2
| ^
Unexpected `b`
Expected `newline` or `end of input`
Expected newline or end of input
4 changes: 2 additions & 2 deletions tests/fixtures/invalid/key-single-open-bracket.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ TOML parse error at line 1, column 2
|
1 | [
| ^
Unexpected `end of input`
Expected `key`
Unexpected end of input
Expected key
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/key-two-equals.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 6
1 | key= = 1
| ^
Unexpected `=`
Expected `quoted string`
Expected quoted string
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/llbrace.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ TOML parse error at line 1, column 3
| ^
Unexpected `[`
Unexpected ` `
Expected `key`
Expected key
While parsing a Table Header
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 7
1 | value=trust
| ^
Unexpected `t`
Expected `quoted string`
Expected quoted string
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/string-no-quotes-in-array.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 10
1 | value = [ZZZ]
| ^
Unexpected `Z`
Expected `newline` or `#`
Expected newline or `#`
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 17
1 | value = { key = ZZZ }
| ^
Unexpected `Z`
Expected `quoted string`
Expected quoted string
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/string-no-quotes-in-table.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 7
1 | value=ZZZ
| ^
Unexpected `Z`
Expected `quoted string`
Expected quoted string
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/table-array-malformed-empty.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 3
1 | [[]]
| ^
Unexpected `]`
Expected `key`
Expected key
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/table-empty.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 2
1 | []
| ^
Unexpected `]`
Expected `key`
Expected key
While parsing a Table Header
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/text-after-integer.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 13
1 | answer = 42 the ultimate answer?
| ^
Unexpected `t`
Expected `newline` or `end of input`
Expected newline or end of input
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/text-after-string.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ TOML parse error at line 1, column 41
1 | string = "Is there life after strings?" No.
| ^
Unexpected `N`
Expected `newline` or `end of input`
Expected newline or end of input
2 changes: 1 addition & 1 deletion tests/fixtures/invalid/text-after-table.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ TOML parse error at line 1, column 9
1 | [error] this shouldn't be here
| ^
Unexpected `t`
Expected `newline` or `end of input`
Expected newline or end of input
While parsing a Table Header