fix: Force combine upgrade for better errors

Fixes toml-rs#295

Cargo.toml

@@ -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"] }

tests/fixtures/invalid/empty-table.stderr

@@ -3,5 +3,5 @@ TOML parse error at line 1, column 2
 1 | []
   |  ^
 Unexpected `]`
-Expected `key`
+Expected key
 While parsing a Table Header

tests/fixtures/invalid/float-no-trailing-digits.stderr

@@ -4,5 +4,5 @@ TOML parse error at line 1, column 12
   |            ^
 Unexpected `
 `
-Expected `digit`
+Expected digit
 While parsing a Float

tests/fixtures/invalid/float-underscore-after-point.stderr

@@ -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

tests/fixtures/invalid/float-underscore-after.stderr

@@ -4,5 +4,5 @@ TOML parse error at line 1, column 11
   |           ^
 Unexpected `
 `
-Expected `digit`
+Expected digit
 While parsing a Float

tests/fixtures/invalid/float-underscore-before-point.stderr

@@ -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

tests/fixtures/invalid/inline-table-newline.stderr

@@ -4,4 +4,4 @@ TOML parse error at line 7, column 11
   |           ^
 Unexpected `
 `
-Expected `key`
+Expected key

tests/fixtures/invalid/integer-underscore-after.stderr

@@ -4,5 +4,5 @@ TOML parse error at line 1, column 11
   |           ^
 Unexpected `
 `
-Expected `digit`
+Expected digit
 While parsing an Integer

tests/fixtures/invalid/integer-underscore-double.stderr

@@ -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

tests/fixtures/invalid/key-after-array.stderr

@@ -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

tests/fixtures/invalid/key-after-table.stderr

@@ -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

tests/fixtures/invalid/key-empty.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 2
 1 |  = 1
   |  ^
 Unexpected `=`
-Expected `key`
+Expected key

tests/fixtures/invalid/key-no-eol.stderr

@@ -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

tests/fixtures/invalid/key-single-open-bracket.stderr

@@ -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

tests/fixtures/invalid/key-two-equals.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 6
 1 | key= = 1
   |      ^
 Unexpected `=`
-Expected `quoted string`
+Expected quoted string

tests/fixtures/invalid/llbrace.stderr

@@ -4,5 +4,5 @@ TOML parse error at line 1, column 3
   |   ^
 Unexpected `[`
 Unexpected ` `
-Expected `key`
+Expected key
 While parsing a Table Header

tests/fixtures/invalid/string-no-quotes-constant-like.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 7
 1 | value=trust
   |       ^
 Unexpected `t`
-Expected `quoted string`
+Expected quoted string

tests/fixtures/invalid/string-no-quotes-in-array.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 10
 1 | value = [ZZZ]
   |          ^
 Unexpected `Z`
-Expected `newline` or `#`
+Expected newline or `#`

tests/fixtures/invalid/string-no-quotes-in-inline-table.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 17
 1 | value = { key = ZZZ }
   |                 ^
 Unexpected `Z`
-Expected `quoted string`
+Expected quoted string

tests/fixtures/invalid/string-no-quotes-in-table.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 1, column 7
 1 | value=ZZZ
   |       ^
 Unexpected `Z`
-Expected `quoted string`
+Expected quoted string

tests/fixtures/invalid/table-array-malformed-empty.stderr

@@ -3,5 +3,5 @@ TOML parse error at line 1, column 3
 1 | [[]]
   |   ^
 Unexpected `]`
-Expected `key`
+Expected key
 While parsing a Table Header

tests/fixtures/invalid/table-empty.stderr

@@ -3,5 +3,5 @@ TOML parse error at line 1, column 2
 1 | []
   |  ^
 Unexpected `]`
-Expected `key`
+Expected key
 While parsing a Table Header

tests/fixtures/invalid/text-after-integer.stderr

@@ -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

tests/fixtures/invalid/text-after-string.stderr

@@ -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

tests/fixtures/invalid/text-after-table.stderr

@@ -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