From 37bae13f8657dad77683be7441e640e9e5cafd5c Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 12 Jan 2022 13:09:03 -0600
Subject: [PATCH] fix: Force combine upgrade for better errors

Fixes #295
---
 Cargo.toml                                                    | 2 +-
 tests/fixtures/invalid/empty-table.stderr                     | 2 +-
 tests/fixtures/invalid/float-no-trailing-digits.stderr        | 2 +-
 tests/fixtures/invalid/float-underscore-after-point.stderr    | 2 +-
 tests/fixtures/invalid/float-underscore-after.stderr          | 2 +-
 tests/fixtures/invalid/float-underscore-before-point.stderr   | 2 +-
 tests/fixtures/invalid/inline-table-newline.stderr            | 2 +-
 tests/fixtures/invalid/integer-underscore-after.stderr        | 2 +-
 tests/fixtures/invalid/integer-underscore-double.stderr       | 2 +-
 tests/fixtures/invalid/key-after-array.stderr                 | 2 +-
 tests/fixtures/invalid/key-after-table.stderr                 | 2 +-
 tests/fixtures/invalid/key-empty.stderr                       | 2 +-
 tests/fixtures/invalid/key-no-eol.stderr                      | 2 +-
 tests/fixtures/invalid/key-single-open-bracket.stderr         | 4 ++--
 tests/fixtures/invalid/key-two-equals.stderr                  | 2 +-
 tests/fixtures/invalid/llbrace.stderr                         | 2 +-
 tests/fixtures/invalid/string-no-quotes-constant-like.stderr  | 2 +-
 tests/fixtures/invalid/string-no-quotes-in-array.stderr       | 2 +-
 .../fixtures/invalid/string-no-quotes-in-inline-table.stderr  | 2 +-
 tests/fixtures/invalid/string-no-quotes-in-table.stderr       | 2 +-
 tests/fixtures/invalid/table-array-malformed-empty.stderr     | 2 +-
 tests/fixtures/invalid/table-empty.stderr                     | 2 +-
 tests/fixtures/invalid/text-after-integer.stderr              | 2 +-
 tests/fixtures/invalid/text-after-string.stderr               | 2 +-
 tests/fixtures/invalid/text-after-table.stderr                | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 239d4720..31907661 100644
--- a/Cargo.toml
+++ b/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"] }
diff --git a/tests/fixtures/invalid/empty-table.stderr b/tests/fixtures/invalid/empty-table.stderr
index 17e80f46..46e13837 100644
--- a/tests/fixtures/invalid/empty-table.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/float-no-trailing-digits.stderr b/tests/fixtures/invalid/float-no-trailing-digits.stderr
index 44cb3186..ddf64350 100644
--- a/tests/fixtures/invalid/float-no-trailing-digits.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/float-underscore-after-point.stderr b/tests/fixtures/invalid/float-underscore-after-point.stderr
index 5552eb52..852f5cf0 100644
--- a/tests/fixtures/invalid/float-underscore-after-point.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/float-underscore-after.stderr b/tests/fixtures/invalid/float-underscore-after.stderr
index 85220ffc..5522b626 100644
--- a/tests/fixtures/invalid/float-underscore-after.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/float-underscore-before-point.stderr b/tests/fixtures/invalid/float-underscore-before-point.stderr
index d6b5ec3e..7e53a5dc 100644
--- a/tests/fixtures/invalid/float-underscore-before-point.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/inline-table-newline.stderr b/tests/fixtures/invalid/inline-table-newline.stderr
index 488fec97..54a52fbd 100644
--- a/tests/fixtures/invalid/inline-table-newline.stderr
+++ b/tests/fixtures/invalid/inline-table-newline.stderr
@@ -4,4 +4,4 @@ TOML parse error at line 7, column 11
   |           ^
 Unexpected `
 `
-Expected `key`
+Expected key
diff --git a/tests/fixtures/invalid/integer-underscore-after.stderr b/tests/fixtures/invalid/integer-underscore-after.stderr
index d4c39a9c..e731ba31 100644
--- a/tests/fixtures/invalid/integer-underscore-after.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/integer-underscore-double.stderr b/tests/fixtures/invalid/integer-underscore-double.stderr
index 613d4759..3f17deea 100644
--- a/tests/fixtures/invalid/integer-underscore-double.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-after-array.stderr b/tests/fixtures/invalid/key-after-array.stderr
index 19630d79..b08b31ba 100644
--- a/tests/fixtures/invalid/key-after-array.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-after-table.stderr b/tests/fixtures/invalid/key-after-table.stderr
index b2def4d2..3961a5ce 100644
--- a/tests/fixtures/invalid/key-after-table.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-empty.stderr b/tests/fixtures/invalid/key-empty.stderr
index 367eecc5..1d0241c7 100644
--- a/tests/fixtures/invalid/key-empty.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-no-eol.stderr b/tests/fixtures/invalid/key-no-eol.stderr
index 3d9739b3..de2d375e 100644
--- a/tests/fixtures/invalid/key-no-eol.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-single-open-bracket.stderr b/tests/fixtures/invalid/key-single-open-bracket.stderr
index 27971465..0851e4cb 100644
--- a/tests/fixtures/invalid/key-single-open-bracket.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/key-two-equals.stderr b/tests/fixtures/invalid/key-two-equals.stderr
index a5c06479..ad54644e 100644
--- a/tests/fixtures/invalid/key-two-equals.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/llbrace.stderr b/tests/fixtures/invalid/llbrace.stderr
index 0d95f37e..e33fb629 100644
--- a/tests/fixtures/invalid/llbrace.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/string-no-quotes-constant-like.stderr b/tests/fixtures/invalid/string-no-quotes-constant-like.stderr
index 01b1a6ac..75cc2b2b 100644
--- a/tests/fixtures/invalid/string-no-quotes-constant-like.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/string-no-quotes-in-array.stderr b/tests/fixtures/invalid/string-no-quotes-in-array.stderr
index 825bc38d..75f73091 100644
--- a/tests/fixtures/invalid/string-no-quotes-in-array.stderr
+++ b/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 `#`
diff --git a/tests/fixtures/invalid/string-no-quotes-in-inline-table.stderr b/tests/fixtures/invalid/string-no-quotes-in-inline-table.stderr
index bab0ccc7..add99d50 100644
--- a/tests/fixtures/invalid/string-no-quotes-in-inline-table.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/string-no-quotes-in-table.stderr b/tests/fixtures/invalid/string-no-quotes-in-table.stderr
index c518dd97..e16f11a2 100644
--- a/tests/fixtures/invalid/string-no-quotes-in-table.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/table-array-malformed-empty.stderr b/tests/fixtures/invalid/table-array-malformed-empty.stderr
index 56633687..65253f80 100644
--- a/tests/fixtures/invalid/table-array-malformed-empty.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/table-empty.stderr b/tests/fixtures/invalid/table-empty.stderr
index 17e80f46..46e13837 100644
--- a/tests/fixtures/invalid/table-empty.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/text-after-integer.stderr b/tests/fixtures/invalid/text-after-integer.stderr
index 4852e792..66c84ee4 100644
--- a/tests/fixtures/invalid/text-after-integer.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/text-after-string.stderr b/tests/fixtures/invalid/text-after-string.stderr
index 4f8a2c8c..a757e60f 100644
--- a/tests/fixtures/invalid/text-after-string.stderr
+++ b/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
diff --git a/tests/fixtures/invalid/text-after-table.stderr b/tests/fixtures/invalid/text-after-table.stderr
index 4c0be520..051b37ef 100644
--- a/tests/fixtures/invalid/text-after-table.stderr
+++ b/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