diff --git a/Cargo.lock b/Cargo.lock index b7dca408a..d067d5ac2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,7 +182,7 @@ dependencies = [ "anstyle", "clap_lex", "strsim", - "terminal_size 0.2.6", + "terminal_size", ] [[package]] @@ -858,16 +858,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "terminal_size" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" -dependencies = [ - "rustix 0.38.34", - "windows-sys 0.59.0", -] - [[package]] name = "thread_local" version = "1.1.8" @@ -972,6 +962,8 @@ dependencies = [ name = "toml_edit" version = "0.22.27" dependencies = [ + "anstream 0.6.18", + "anstyle", "indexmap", "kstring", "proptest", @@ -983,6 +975,7 @@ dependencies = [ "toml-test-data", "toml-test-harness", "toml_datetime", + "toml_parse", "toml_write", "walkdir", "winnow", @@ -1228,9 +1221,5 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ - "anstream 0.3.2", - "anstyle", - "is-terminal", "memchr", - "terminal_size 0.4.1", ] diff --git a/Cargo.toml b/Cargo.toml index e00cfab1c..38776d763 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,6 +46,7 @@ flat_map_option = "warn" float_cmp_const = "warn" fn_params_excessive_bools = "warn" from_iter_instead_of_collect = "warn" +get_first = "allow" if_same_then_else = "allow" implicit_clone = "warn" imprecise_flops = "warn" @@ -64,6 +65,7 @@ mem_forget = "warn" mutex_integer = "warn" needless_continue = "allow" needless_for_each = "warn" +needless_bool = "allow" negative_feature_names = "warn" path_buf_push_overwrite = "warn" ptr_as_ptr = "warn" diff --git a/crates/toml/tests/compliance/invalid.rs b/crates/toml/tests/compliance/invalid.rs index f3e86eac8..251c2a11c 100644 --- a/crates/toml/tests/compliance/invalid.rs +++ b/crates/toml/tests/compliance/invalid.rs @@ -20,7 +20,7 @@ TOML parse error at line 1, column 6 | 1 | a = "" | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` "#]], ); @@ -35,7 +35,7 @@ TOML parse error at line 1, column 6 | 1 | a = '' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters "#]], ); @@ -46,11 +46,11 @@ fn stray_cr() { t( "\r", str![[r#" -TOML parse error at line 1, column 1 +TOML parse error at line 1, column 2 | 1 | - | ^ - + | ^ +carriage return must be followed by newline, expected newline "#]], ); @@ -62,44 +62,43 @@ TOML parse error at line 1, column 8 1 | a = [ ] | ^ - +carriage return must be followed by newline, expected newline "#]], ); t( "a = \"\"\"\r\"\"\"", str![[r#" -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 9 | 1 | a = """ """ - | ^ -invalid multiline basic string + | ^ +carriage return must be followed by newline, expected newline "#]], ); t( "a = \"\"\"\\ \r \"\"\"", str![[r#" -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 12 | 1 | a = """\ """ - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +carriage return must be followed by newline, expected newline "#]], ); t( "a = '''\r'''", str![[r#" -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 9 | 1 | a = ''' ''' - | ^ -invalid multiline literal string + | ^ +carriage return must be followed by newline, expected newline "#]], ); @@ -111,7 +110,7 @@ TOML parse error at line 1, column 6 1 | a = ' ' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters "#]], ); @@ -123,7 +122,7 @@ TOML parse error at line 1, column 6 1 | a = " " | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` "#]], ); @@ -143,7 +142,7 @@ TOML parse error at line 5, column 1 | 5 | a = 2 | ^ -duplicate key `a` in table `t2` +duplicate key "#]], ); @@ -166,7 +165,7 @@ fn text_error_span() { let err = input.parse::().unwrap_err(); dbg!(&err); let actual = &input[err.span().unwrap()]; - assert_eq!(actual, "a"); + assert_eq!(actual, "asdf"); } #[test] @@ -176,5 +175,6 @@ fn fuzzed_68144_error_span() { let err = input.parse::().unwrap_err(); dbg!(&err); let actual = &input[err.span().unwrap()]; - assert_eq!(actual, "ᾂ"); + // atm bad escape values are reported as missing escape values + assert_eq!(actual, ""); } diff --git a/crates/toml/tests/serde/spanned.rs b/crates/toml/tests/serde/spanned.rs index 1f820bb0b..ca4220392 100644 --- a/crates/toml/tests/serde/spanned.rs +++ b/crates/toml/tests/serde/spanned.rs @@ -58,11 +58,7 @@ fn test_spanned_field() { 0, "incorrect `foo_outer.span().start`" ); - assert_eq!( - foo_outer.span().end, - input.len(), - "incorrect `foo_outer.span().end`" - ); + assert_eq!(foo_outer.span().end, 0, "incorrect `foo_outer.span().end`"); assert_eq!( foo.foo.into_inner(), foo_outer.into_inner().foo, @@ -125,7 +121,7 @@ fn test_inner_spanned_table() { if zero { assert_eq!(foo.foo.span().start, 0, "invalid `foo.foo.span().start`"); - assert_eq!(foo.foo.span().end, 73, "invalid `foo.foo.span().end`"); + assert_eq!(foo.foo.span().end, 5, "invalid `foo.foo.span().end`"); } else { assert_eq!( foo.foo.span().start, @@ -269,7 +265,7 @@ fn test_spanned_array() { "; let foo_list: Foo = crate::from_str(toml).unwrap(); - for (foo, expected) in foo_list.foo.iter().zip([0..75, 84..159]) { + for (foo, expected) in foo_list.foo.iter().zip([0..7, 84..91]) { assert_eq!(foo.span(), expected); for (k, v) in foo.as_ref().iter() { assert_eq!(&toml[k.span().start..k.span().end], k.as_ref()); diff --git a/crates/toml/tests/snapshots/invalid/array/double-comma-01.stderr b/crates/toml/tests/snapshots/invalid/array/double-comma-01.stderr index 6cb810d24..4c7c158e1 100644 --- a/crates/toml/tests/snapshots/invalid/array/double-comma-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/double-comma-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | double-comma-1 = [1,,2] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/double-comma-02.stderr b/crates/toml/tests/snapshots/invalid/array/double-comma-02.stderr index 60ab5b56b..3e4146c59 100644 --- a/crates/toml/tests/snapshots/invalid/array/double-comma-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/double-comma-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 23 | 1 | double-comma-2 = [1,2,,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/double-comma-1.stderr b/crates/toml/tests/snapshots/invalid/array/double-comma-1.stderr index 6cb810d24..4c7c158e1 100644 --- a/crates/toml/tests/snapshots/invalid/array/double-comma-1.stderr +++ b/crates/toml/tests/snapshots/invalid/array/double-comma-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | double-comma-1 = [1,,2] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/double-comma-2.stderr b/crates/toml/tests/snapshots/invalid/array/double-comma-2.stderr index 60ab5b56b..3e4146c59 100644 --- a/crates/toml/tests/snapshots/invalid/array/double-comma-2.stderr +++ b/crates/toml/tests/snapshots/invalid/array/double-comma-2.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 23 | 1 | double-comma-2 = [1,2,,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/extend-defined-aot.stderr b/crates/toml/tests/snapshots/invalid/array/extend-defined-aot.stderr index 970e0ece7..571c87a08 100644 --- a/crates/toml/tests/snapshots/invalid/array/extend-defined-aot.stderr +++ b/crates/toml/tests/snapshots/invalid/array/extend-defined-aot.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 5 | 3 | arr.val1=1 - | ^ -duplicate key `val1` + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/array/extending-table.stderr b/crates/toml/tests/snapshots/invalid/array/extending-table.stderr index 6f92ff668..107e7dd22 100644 --- a/crates/toml/tests/snapshots/invalid/array/extending-table.stderr +++ b/crates/toml/tests/snapshots/invalid/array/extending-table.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 5, column 1 +TOML parse error at line 5, column 2 | 5 | [a.c] - | ^ -invalid table header -dotted key `a` attempted to extend non-table type (array) + | ^ +cannot extend value of type array with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr b/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr index 1202bb185..78d517c0d 100644 --- a/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 14 +TOML parse error at line 1, column 9 | 1 | arrr = [true false] - | ^ -invalid array -expected `]` + | ^^^^^^^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr b/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr index 8e21f51fe..8bde851e3 100644 --- a/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 15 | 1 | wrong = [ 1 2 3 ] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-01.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-01.stderr index 6f0a3e8d8..5e4523e1d 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 24 | 1 | no-close-1 = [ 1, 2, 3 | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-02.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-02.stderr index 96c4d648c..33a26e41e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 18 | 1 | no-close-2 = [1, | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-03.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-03.stderr index b84e3b9b9..023f76ae3 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | no-close-3 = [42 #] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-04.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-04.stderr index ecf422409..f36c7d306 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-04.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 25 | 1 | no-close-4 = [{ key = 42 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-05.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-05.stderr index c5e9674c0..ad93fd54c 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-05.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-05.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 27 | 1 | no-close-5 = [{ key = 42} | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-06.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-06.stderr index 2512a4353..cc28206b3 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-06.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-06.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 26 | 1 | no-close-6 = [{ key = 42 #}] - | ^ -invalid inline table -expected `}` + | ^^^ +comments are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-07.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-07.stderr index a49e9881d..0fd17623e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-07.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-07.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 30 | 1 | no-close-7 = [{ key = 42} #] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-08.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-08.stderr index 0e25a0bd4..7c6b85ace 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-08.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-08.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 16 | 1 | no-close-8 = [ | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-1.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-1.stderr index 6f0a3e8d8..5e4523e1d 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-1.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 24 | 1 | no-close-1 = [ 1, 2, 3 | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-2.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-2.stderr index 96c4d648c..33a26e41e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-2.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-2.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 18 | 1 | no-close-2 = [1, | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-3.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-3.stderr index b84e3b9b9..023f76ae3 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-3.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-3.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | no-close-3 = [42 #] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-4.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-4.stderr index ecf422409..f36c7d306 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-4.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-4.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 25 | 1 | no-close-4 = [{ key = 42 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-5.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-5.stderr index c5e9674c0..ad93fd54c 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-5.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-5.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 27 | 1 | no-close-5 = [{ key = 42} | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-6.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-6.stderr index 2512a4353..cc28206b3 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-6.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-6.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 26 | 1 | no-close-6 = [{ key = 42 #}] - | ^ -invalid inline table -expected `}` + | ^^^ +comments are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-7.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-7.stderr index a49e9881d..0fd17623e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-7.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-7.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 30 | 1 | no-close-7 = [{ key = 42} #] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-8.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-8.stderr index 0e25a0bd4..7c6b85ace 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-8.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-8.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 16 | 1 | no-close-8 = [ | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-table-01.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-table-01.stderr index b4c3c32d4..a2ca26b49 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-table-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-table-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 16 | 1 | x = [{ key = 42 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-close-table-02.stderr b/crates/toml/tests/snapshots/invalid/array/no-close-table-02.stderr index 535943e2e..b1f38b59f 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-close-table-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-close-table-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | x = [{ key = 42 # | ^ -invalid inline table -expected `}` +comments are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr index e50fb69db..ec1c49ebc 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 15 | 1 | no-comma-1 = [true false] - | ^ -invalid array -expected `]` + | ^^^^^^^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr index b34d709c7..8d272d48e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 20 | 1 | no-comma-2 = [ 1 2 3 ] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-03.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-03.stderr index c7cbec4ea..01037f405 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-03.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 22 | 1 | no-comma-3 = [ 1 #,] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr index e50fb69db..ec1c49ebc 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 15 | 1 | no-comma-1 = [true false] - | ^ -invalid array -expected `]` + | ^^^^^^^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr index b34d709c7..8d272d48e 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 20 | 1 | no-comma-2 = [ 1 2 3 ] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-3.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-3.stderr index c7cbec4ea..01037f405 100644 --- a/crates/toml/tests/snapshots/invalid/array/no-comma-3.stderr +++ b/crates/toml/tests/snapshots/invalid/array/no-comma-3.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 22 | 1 | no-comma-3 = [ 1 #,] | ^ -invalid array -expected `]` +unclosed array, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/array/only-comma-01.stderr b/crates/toml/tests/snapshots/invalid/array/only-comma-01.stderr index 3616ca9f9..0ff046edf 100644 --- a/crates/toml/tests/snapshots/invalid/array/only-comma-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/only-comma-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | only-comma-1 = [,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/only-comma-02.stderr b/crates/toml/tests/snapshots/invalid/array/only-comma-02.stderr index 8284be5d5..579b18efe 100644 --- a/crates/toml/tests/snapshots/invalid/array/only-comma-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/only-comma-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | only-comma-2 = [,,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/only-comma-1.stderr b/crates/toml/tests/snapshots/invalid/array/only-comma-1.stderr index 3616ca9f9..0ff046edf 100644 --- a/crates/toml/tests/snapshots/invalid/array/only-comma-1.stderr +++ b/crates/toml/tests/snapshots/invalid/array/only-comma-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | only-comma-1 = [,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/only-comma-2.stderr b/crates/toml/tests/snapshots/invalid/array/only-comma-2.stderr index 8284be5d5..579b18efe 100644 --- a/crates/toml/tests/snapshots/invalid/array/only-comma-2.stderr +++ b/crates/toml/tests/snapshots/invalid/array/only-comma-2.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | only-comma-2 = [,,] | ^ -invalid array -expected `]` +extra comma in array, expected value diff --git a/crates/toml/tests/snapshots/invalid/array/tables-01.stderr b/crates/toml/tests/snapshots/invalid/array/tables-01.stderr index 771b4f6c9..ac74f7ad7 100644 --- a/crates/toml/tests/snapshots/invalid/array/tables-01.stderr +++ b/crates/toml/tests/snapshots/invalid/array/tables-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 3 | 4 | [[fruit]] # Not allowed - | ^ -invalid table header -duplicate key `fruit` in document root + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/array/tables-02.stderr b/crates/toml/tests/snapshots/invalid/array/tables-02.stderr index 1f88e6efd..d507139b1 100644 --- a/crates/toml/tests/snapshots/invalid/array/tables-02.stderr +++ b/crates/toml/tests/snapshots/invalid/array/tables-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 9, column 3 +TOML parse error at line 9, column 10 | 9 | [fruit.variety] - | ^ -invalid table header -duplicate key `variety` in table `fruit` + | ^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/array/text-after-array-entries.stderr b/crates/toml/tests/snapshots/invalid/array/text-after-array-entries.stderr index 23b5ac27c..0f478e4b5 100644 --- a/crates/toml/tests/snapshots/invalid/array/text-after-array-entries.stderr +++ b/crates/toml/tests/snapshots/invalid/array/text-after-array-entries.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 46 +TOML parse error at line 3, column 3 | -2 | "Is there life after an array separator?", No - | ^ -invalid array -expected `]` +3 | "Entry" + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/array/text-before-array-separator.stderr b/crates/toml/tests/snapshots/invalid/array/text-before-array-separator.stderr index 9d667990b..ed45dfd52 100644 --- a/crates/toml/tests/snapshots/invalid/array/text-before-array-separator.stderr +++ b/crates/toml/tests/snapshots/invalid/array/text-before-array-separator.stderr @@ -2,5 +2,4 @@ TOML parse error at line 2, column 46 | 2 | "Is there life before an array separator?" No, | ^ -invalid array -expected `]` +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr b/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr index 580237357..217a53111 100644 --- a/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr +++ b/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 3 +TOML parse error at line 3, column 8 | 3 | I don't belong, - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/bool/almost-false-with-extra.stderr b/crates/toml/tests/snapshots/invalid/bool/almost-false-with-extra.stderr index 151708414..e156e57bb 100644 --- a/crates/toml/tests/snapshots/invalid/bool/almost-false-with-extra.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/almost-false-with-extra.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | almost-false-with-extra = falsify - | ^ -invalid string -expected `"`, `'` + | ^^^^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/almost-false.stderr b/crates/toml/tests/snapshots/invalid/bool/almost-false.stderr index ba22196c1..6f1535af4 100644 --- a/crates/toml/tests/snapshots/invalid/bool/almost-false.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/almost-false.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | almost-false = fals - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/almost-true-with-extra.stderr b/crates/toml/tests/snapshots/invalid/bool/almost-true-with-extra.stderr index 23e230e05..8124a9704 100644 --- a/crates/toml/tests/snapshots/invalid/bool/almost-true-with-extra.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/almost-true-with-extra.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | almost-true-with-extra = truthy - | ^ -invalid string -expected `"`, `'` + | ^^^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/almost-true.stderr b/crates/toml/tests/snapshots/invalid/bool/almost-true.stderr index 21bdf37d4..880a8b4aa 100644 --- a/crates/toml/tests/snapshots/invalid/bool/almost-true.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/almost-true.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | almost-true = tru - | ^ -invalid string -expected `"`, `'` + | ^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/capitalized-false.stderr b/crates/toml/tests/snapshots/invalid/bool/capitalized-false.stderr index fd318cad5..bf969c748 100644 --- a/crates/toml/tests/snapshots/invalid/bool/capitalized-false.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/capitalized-false.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 28 | 1 | capitalized-false = False - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/capitalized-true.stderr b/crates/toml/tests/snapshots/invalid/bool/capitalized-true.stderr index cb32d8eb9..0c4120b64 100644 --- a/crates/toml/tests/snapshots/invalid/bool/capitalized-true.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/capitalized-true.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 28 | 1 | capitalized-true = True - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/just-f.stderr b/crates/toml/tests/snapshots/invalid/bool/just-f.stderr index cc4fb783d..e944e69bb 100644 --- a/crates/toml/tests/snapshots/invalid/bool/just-f.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/just-f.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 27 | 1 | just-f = f | ^ -invalid string -expected `"`, `'` +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/just-t.stderr b/crates/toml/tests/snapshots/invalid/bool/just-t.stderr index f2d889b1e..0b53c17ef 100644 --- a/crates/toml/tests/snapshots/invalid/bool/just-t.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/just-t.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 27 | 1 | just-t = t | ^ -invalid string -expected `"`, `'` +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/mixed-case-false.stderr b/crates/toml/tests/snapshots/invalid/bool/mixed-case-false.stderr index d96dc609f..f3bc4769a 100644 --- a/crates/toml/tests/snapshots/invalid/bool/mixed-case-false.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/mixed-case-false.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | mixed-case-false = falsE - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/mixed-case-true.stderr b/crates/toml/tests/snapshots/invalid/bool/mixed-case-true.stderr index e7f8289b5..1b8f1ec32 100644 --- a/crates/toml/tests/snapshots/invalid/bool/mixed-case-true.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/mixed-case-true.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | mixed-case-true = trUe - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/mixed-case.stderr b/crates/toml/tests/snapshots/invalid/bool/mixed-case.stderr index 994020ef9..e6b0265e8 100644 --- a/crates/toml/tests/snapshots/invalid/bool/mixed-case.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/mixed-case.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 27 +TOML parse error at line 1, column 35 | 1 | mixed-case = valid = False - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/bool/starting-same-false.stderr b/crates/toml/tests/snapshots/invalid/bool/starting-same-false.stderr index 1cc00d59b..84e523729 100644 --- a/crates/toml/tests/snapshots/invalid/bool/starting-same-false.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/starting-same-false.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 27 | 1 | starting-same-false = falsey - | ^ -expected newline, `#` + | ^^^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/starting-same-true.stderr b/crates/toml/tests/snapshots/invalid/bool/starting-same-true.stderr index a7cc00b73..34407a3fb 100644 --- a/crates/toml/tests/snapshots/invalid/bool/starting-same-true.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/starting-same-true.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 31 +TOML parse error at line 1, column 27 | 1 | starting-same-true = truer - | ^ -expected newline, `#` + | ^^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/bool/wrong-case-false.stderr b/crates/toml/tests/snapshots/invalid/bool/wrong-case-false.stderr index fd15caaca..6457825dd 100644 --- a/crates/toml/tests/snapshots/invalid/bool/wrong-case-false.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/wrong-case-false.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | wrong-case-false = FALSE - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +invalid boolean, expected `false` diff --git a/crates/toml/tests/snapshots/invalid/bool/wrong-case-true.stderr b/crates/toml/tests/snapshots/invalid/bool/wrong-case-true.stderr index bc60a4cce..216dd0a21 100644 --- a/crates/toml/tests/snapshots/invalid/bool/wrong-case-true.stderr +++ b/crates/toml/tests/snapshots/invalid/bool/wrong-case-true.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 27 | 1 | wrong-case-true = TRUE - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/control/bare-cr.stderr b/crates/toml/tests/snapshots/invalid/control/bare-cr.stderr index f0062f6f2..093234c3d 100644 --- a/crates/toml/tests/snapshots/invalid/control/bare-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/bare-cr.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 2 | 2 | - | ^ - + | ^ +carriage return must be followed by newline, expected newline diff --git a/crates/toml/tests/snapshots/invalid/control/bare-formfeed.stderr b/crates/toml/tests/snapshots/invalid/control/bare-formfeed.stderr index 449ec8786..d414f54ea 100644 --- a/crates/toml/tests/snapshots/invalid/control/bare-formfeed.stderr +++ b/crates/toml/tests/snapshots/invalid/control/bare-formfeed.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | bare-formfeed = | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/control/bare-null.stderr b/crates/toml/tests/snapshots/invalid/control/bare-null.stderr index 9c8231db0..7e6a7bb54 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/bare-null.stderr and b/crates/toml/tests/snapshots/invalid/control/bare-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/bare-vertical-tab.stderr b/crates/toml/tests/snapshots/invalid/control/bare-vertical-tab.stderr index c8e01ba04..7ef646cd5 100644 --- a/crates/toml/tests/snapshots/invalid/control/bare-vertical-tab.stderr +++ b/crates/toml/tests/snapshots/invalid/control/bare-vertical-tab.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | bare-vertical-tab = | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/control/comment-cr.stderr b/crates/toml/tests/snapshots/invalid/control/comment-cr.stderr index 54e42df86..2e8b40b02 100644 --- a/crates/toml/tests/snapshots/invalid/control/comment-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/comment-cr.stderr @@ -1,6 +1,6 @@ -TOML parse error at line 1, column 47 +TOML parse error at line 1, column 48 | 1 | comment-cr = "Carriage return in comment" # a=1 - | ^ -expected newline, `#` + | ^ +carriage return must be followed by newline, expected newline diff --git a/crates/toml/tests/snapshots/invalid/control/comment-del.stderr b/crates/toml/tests/snapshots/invalid/control/comment-del.stderr index 5eae7a472..21f76ced1 100644 --- a/crates/toml/tests/snapshots/invalid/control/comment-del.stderr +++ b/crates/toml/tests/snapshots/invalid/control/comment-del.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 27 | 1 | comment-del = "0x7f" #  | ^ -expected newline, `#` +invalid comment character, expected printable characters diff --git a/crates/toml/tests/snapshots/invalid/control/comment-ff.stderr b/crates/toml/tests/snapshots/invalid/control/comment-ff.stderr index 6f54974d3..4d02e1b49 100644 --- a/crates/toml/tests/snapshots/invalid/control/comment-ff.stderr +++ b/crates/toml/tests/snapshots/invalid/control/comment-ff.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 27 | 1 | comment-ff = "0x7f" # | ^ -expected newline, `#` +invalid comment character, expected printable characters diff --git a/crates/toml/tests/snapshots/invalid/control/comment-lf.stderr b/crates/toml/tests/snapshots/invalid/control/comment-lf.stderr index 3eacd622f..d63f69a84 100644 --- a/crates/toml/tests/snapshots/invalid/control/comment-lf.stderr +++ b/crates/toml/tests/snapshots/invalid/control/comment-lf.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 27 | 1 | comment-lf = "ctrl-P" #  | ^ -expected newline, `#` +invalid comment character, expected printable characters diff --git a/crates/toml/tests/snapshots/invalid/control/comment-null.stderr b/crates/toml/tests/snapshots/invalid/control/comment-null.stderr index ba5bc8004..95d176591 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/comment-null.stderr and b/crates/toml/tests/snapshots/invalid/control/comment-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/comment-us.stderr b/crates/toml/tests/snapshots/invalid/control/comment-us.stderr index f34076e62..e0aba369f 100644 --- a/crates/toml/tests/snapshots/invalid/control/comment-us.stderr +++ b/crates/toml/tests/snapshots/invalid/control/comment-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 27 | 1 | comment-us = "ctrl-_" #  | ^ -expected newline, `#` +invalid comment character, expected printable characters diff --git a/crates/toml/tests/snapshots/invalid/control/multi-cr.stderr b/crates/toml/tests/snapshots/invalid/control/multi-cr.stderr index d5c749c1b..7b94b8522 100644 --- a/crates/toml/tests/snapshots/invalid/control/multi-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/multi-cr.stderr @@ -1,6 +1,6 @@ -TOML parse error at line 1, column 21 +TOML parse error at line 1, column 22 | 1 | multi-cr = """null """ - | ^ -invalid multiline basic string + | ^ +carriage return must be followed by newline, expected newline diff --git a/crates/toml/tests/snapshots/invalid/control/multi-del.stderr b/crates/toml/tests/snapshots/invalid/control/multi-del.stderr index a1b54b71f..944111d60 100644 --- a/crates/toml/tests/snapshots/invalid/control/multi-del.stderr +++ b/crates/toml/tests/snapshots/invalid/control/multi-del.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | multi-del = """null""" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `\`, characters diff --git a/crates/toml/tests/snapshots/invalid/control/multi-lf.stderr b/crates/toml/tests/snapshots/invalid/control/multi-lf.stderr index a0a8f7b86..34cefb649 100644 --- a/crates/toml/tests/snapshots/invalid/control/multi-lf.stderr +++ b/crates/toml/tests/snapshots/invalid/control/multi-lf.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | multi-lf = """null""" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `\`, characters diff --git a/crates/toml/tests/snapshots/invalid/control/multi-null.stderr b/crates/toml/tests/snapshots/invalid/control/multi-null.stderr index 2d3c33534..2a418d050 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/multi-null.stderr and b/crates/toml/tests/snapshots/invalid/control/multi-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/multi-us.stderr b/crates/toml/tests/snapshots/invalid/control/multi-us.stderr index ac556b290..23d858875 100644 --- a/crates/toml/tests/snapshots/invalid/control/multi-us.stderr +++ b/crates/toml/tests/snapshots/invalid/control/multi-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | multi-us = """null""" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `\`, characters diff --git a/crates/toml/tests/snapshots/invalid/control/only-ff.stderr b/crates/toml/tests/snapshots/invalid/control/only-ff.stderr index c2a6dc819..07e2fee4c 100644 --- a/crates/toml/tests/snapshots/invalid/control/only-ff.stderr +++ b/crates/toml/tests/snapshots/invalid/control/only-ff.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 1 +TOML parse error at line 1, column 2 | 1 | - | ^ -invalid key + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/control/only-null.stderr b/crates/toml/tests/snapshots/invalid/control/only-null.stderr index 9e2bb838d..ff88e36f4 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/only-null.stderr and b/crates/toml/tests/snapshots/invalid/control/only-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/only-vt.stderr b/crates/toml/tests/snapshots/invalid/control/only-vt.stderr index 0889e259c..aa4c30f18 100644 --- a/crates/toml/tests/snapshots/invalid/control/only-vt.stderr +++ b/crates/toml/tests/snapshots/invalid/control/only-vt.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 1 +TOML parse error at line 1, column 2 | 1 | - | ^ -invalid key + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/control/rawmulti-cr.stderr b/crates/toml/tests/snapshots/invalid/control/rawmulti-cr.stderr index a39de8b40..d5ce6bcaa 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawmulti-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawmulti-cr.stderr @@ -1,6 +1,6 @@ -TOML parse error at line 1, column 24 +TOML parse error at line 1, column 25 | 1 | rawmulti-cr = '''null ''' - | ^ -invalid multiline literal string + | ^ +carriage return must be followed by newline, expected newline diff --git a/crates/toml/tests/snapshots/invalid/control/rawmulti-del.stderr b/crates/toml/tests/snapshots/invalid/control/rawmulti-del.stderr index 7972a2bd9..a6ffbd0c4 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawmulti-del.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawmulti-del.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 24 | 1 | rawmulti-del = '''null''' | ^ -invalid multiline literal string +invalid multi-line literal string, expected non-single-quote characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawmulti-lf.stderr b/crates/toml/tests/snapshots/invalid/control/rawmulti-lf.stderr index 1898ec852..3d70c234f 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawmulti-lf.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawmulti-lf.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 24 | 1 | rawmulti-lf = '''null''' | ^ -invalid multiline literal string +invalid multi-line literal string, expected non-single-quote characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawmulti-null.stderr b/crates/toml/tests/snapshots/invalid/control/rawmulti-null.stderr index d583ce6f5..8ce4e6ce4 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/rawmulti-null.stderr and b/crates/toml/tests/snapshots/invalid/control/rawmulti-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/rawmulti-us.stderr b/crates/toml/tests/snapshots/invalid/control/rawmulti-us.stderr index 4c412f78f..cc3272a31 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawmulti-us.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawmulti-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 24 | 1 | rawmulti-us = '''null''' | ^ -invalid multiline literal string +invalid multi-line literal string, expected non-single-quote characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawstring-cr.stderr b/crates/toml/tests/snapshots/invalid/control/rawstring-cr.stderr index bc8a1a2cb..50614e13d 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawstring-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawstring-cr.stderr @@ -3,4 +3,4 @@ TOML parse error at line 1, column 23 1 | rawstring-cr = 'null ' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawstring-del.stderr b/crates/toml/tests/snapshots/invalid/control/rawstring-del.stderr index e80e322a3..a3fd20075 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawstring-del.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawstring-del.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | rawstring-del = 'null' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawstring-lf.stderr b/crates/toml/tests/snapshots/invalid/control/rawstring-lf.stderr index b8874c639..464d486d0 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawstring-lf.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawstring-lf.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | rawstring-lf = 'null' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters diff --git a/crates/toml/tests/snapshots/invalid/control/rawstring-null.stderr b/crates/toml/tests/snapshots/invalid/control/rawstring-null.stderr index 9227d090e..1e568f04b 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/rawstring-null.stderr and b/crates/toml/tests/snapshots/invalid/control/rawstring-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/rawstring-us.stderr b/crates/toml/tests/snapshots/invalid/control/rawstring-us.stderr index 9cf3fae52..e57ed2d00 100644 --- a/crates/toml/tests/snapshots/invalid/control/rawstring-us.stderr +++ b/crates/toml/tests/snapshots/invalid/control/rawstring-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | rawstring-us = 'null' | ^ -invalid literal string +invalid literal string, expected non-single-quote visible characters diff --git a/crates/toml/tests/snapshots/invalid/control/string-bs.stderr b/crates/toml/tests/snapshots/invalid/control/string-bs.stderr index 3f7b5ee25..61f8584ed 100644 --- a/crates/toml/tests/snapshots/invalid/control/string-bs.stderr +++ b/crates/toml/tests/snapshots/invalid/control/string-bs.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 25 | 1 | string-bs = "backspace" | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` diff --git a/crates/toml/tests/snapshots/invalid/control/string-cr.stderr b/crates/toml/tests/snapshots/invalid/control/string-cr.stderr index 0eff4c261..45e01a14c 100644 --- a/crates/toml/tests/snapshots/invalid/control/string-cr.stderr +++ b/crates/toml/tests/snapshots/invalid/control/string-cr.stderr @@ -3,4 +3,4 @@ TOML parse error at line 1, column 20 1 | string-cr = "null " | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` diff --git a/crates/toml/tests/snapshots/invalid/control/string-del.stderr b/crates/toml/tests/snapshots/invalid/control/string-del.stderr index b6ace6b19..96ffe2943 100644 --- a/crates/toml/tests/snapshots/invalid/control/string-del.stderr +++ b/crates/toml/tests/snapshots/invalid/control/string-del.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | string-del = "null" | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` diff --git a/crates/toml/tests/snapshots/invalid/control/string-lf.stderr b/crates/toml/tests/snapshots/invalid/control/string-lf.stderr index c3b141e81..b0bd4e433 100644 --- a/crates/toml/tests/snapshots/invalid/control/string-lf.stderr +++ b/crates/toml/tests/snapshots/invalid/control/string-lf.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | string-lf = "null" | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` diff --git a/crates/toml/tests/snapshots/invalid/control/string-null.stderr b/crates/toml/tests/snapshots/invalid/control/string-null.stderr index e9fc0befa..aecc806ab 100644 Binary files a/crates/toml/tests/snapshots/invalid/control/string-null.stderr and b/crates/toml/tests/snapshots/invalid/control/string-null.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/control/string-us.stderr b/crates/toml/tests/snapshots/invalid/control/string-us.stderr index 26f2f6a0f..f4635723c 100644 --- a/crates/toml/tests/snapshots/invalid/control/string-us.stderr +++ b/crates/toml/tests/snapshots/invalid/control/string-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | string-us = "null" | ^ -invalid basic string +invalid basic string, expected non-double-quote visible characters, `\` diff --git a/crates/toml/tests/snapshots/invalid/datetime/day-zero.stderr b/crates/toml/tests/snapshots/invalid/datetime/day-zero.stderr index b79d7f54b..024839bee 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/day-zero.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/day-zero.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 15 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-00T09:09:09.09Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 30 diff --git a/crates/toml/tests/snapshots/invalid/datetime/feb-29.stderr b/crates/toml/tests/snapshots/invalid/datetime/feb-29.stderr index 63fac67c6..a696808e4 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/feb-29.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/feb-29.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 29 +TOML parse error at line 1, column 21 | 1 | "not a leap year" = 2100-02-29T15:15:15Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 28 diff --git a/crates/toml/tests/snapshots/invalid/datetime/feb-30.stderr b/crates/toml/tests/snapshots/invalid/datetime/feb-30.stderr index 2b5212af0..cb3d32f86 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/feb-30.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/feb-30.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 44 +TOML parse error at line 1, column 36 | 1 | "only 28 or 29 days in february" = 1988-02-30T15:15:15Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 29 diff --git a/crates/toml/tests/snapshots/invalid/datetime/hour-over.stderr b/crates/toml/tests/snapshots/invalid/datetime/hour-over.stderr index 0e6747da3..a79d72ae7 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/hour-over.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/hour-over.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 15 +TOML parse error at line 2, column 5 | 2 | d = 2006-01-01T24:00:00-00:00 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected hour between 00 and 23 diff --git a/crates/toml/tests/snapshots/invalid/datetime/mday-over.stderr b/crates/toml/tests/snapshots/invalid/datetime/mday-over.stderr index edb976990..88d86b759 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/mday-over.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/mday-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-32T00:00:00-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/datetime/mday-under.stderr b/crates/toml/tests/snapshots/invalid/datetime/mday-under.stderr index 6af20509d..37db341b6 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/mday-under.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/mday-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-00T00:00:00-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/datetime/minute-over.stderr b/crates/toml/tests/snapshots/invalid/datetime/minute-over.stderr index 20f3b4bc6..c8834fdd1 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/minute-over.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/minute-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 19 +TOML parse error at line 2, column 5 | 2 | d = 2006-01-01T00:60:00-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected minute between 00 and 59 diff --git a/crates/toml/tests/snapshots/invalid/datetime/month-over.stderr b/crates/toml/tests/snapshots/invalid/datetime/month-over.stderr index 33334755b..00a8144c9 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/month-over.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/month-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2006-13-01T00:00:00-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/datetime/month-under.stderr b/crates/toml/tests/snapshots/invalid/datetime/month-under.stderr index 5d0cd0645..f1008fa3a 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/month-under.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/month-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2007-00-01T00:00:00-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-date-time-sep.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-date-time-sep.stderr index 3cd9fb107..37ba3dda7 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-date-time-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-date-time-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 17 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-0909:09:09 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-leads-month.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-leads-month.stderr index 3e0ccf722..5f28e12fd 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-leads-month.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-leads-month.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 17 +TOML parse error at line 2, column 12 | 2 | no-leads = 1987-7-05T17:45:00Z - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit month (MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-leads-with-milli.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-leads-with-milli.stderr index df9190dcf..7cf53c77c 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-leads-with-milli.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-leads-with-milli.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 22 +TOML parse error at line 2, column 14 | 2 | with-milli = 1987-07-5T17:45:00.12Z - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-leads.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-leads.stderr index 3e0ccf722..5f28e12fd 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-leads.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-leads.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 17 +TOML parse error at line 2, column 12 | 2 | no-leads = 1987-7-05T17:45:00Z - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit month (MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-secs.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-secs.stderr index 078d0a001..f8cb93291 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-secs.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-secs.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 27 +TOML parse error at line 2, column 11 | 2 | no-secs = 1987-07-05T17:45Z - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^ +invalid time, expected `:` (MM:SS) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-t.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-t.stderr index 15e955463..f72ce0d26 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-t.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-t.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 18 +TOML parse error at line 2, column 8 | 2 | no-t = 1987-07-0517:45:00Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/datetime/no-year-month-sep.stderr b/crates/toml/tests/snapshots/invalid/datetime/no-year-month-sep.stderr index b003ff9da..1fc69e8c3 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/no-year-month-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/no-year-month-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 7 | 1 | foo = 199709-09 - | ^ -expected newline, `#` + | ^^^^^^^^^ +invalid date, expected `-` (MM-DD) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-minute-1digit.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-minute-1digit.stderr index a84588417..88c3ac9a0 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-minute-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-minute-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 33 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09:9 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected a two-digit minute (MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute-sep.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute-sep.stderr index 6825d9504..8e662fc7a 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+0909 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute.stderr index 38a715d66..8fc23c54a 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-hour-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 30 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+ - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected hour diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-minute.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-minute.stderr index a32eae1f5..4cb8178da 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-minus-no-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-hour.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-hour.stderr index f2254c4b5..a4f513fa2 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-hour.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-hour.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 25 +TOML parse error at line 2, column 5 | 2 | d = 1985-06-18 17:04:07+25:00 - | ^ -invalid time offset -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected hours between 00 and 23 diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-minute.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-minute.stderr index ce42d2ede..221354d9f 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-overflow-minute.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 28 +TOML parse error at line 3, column 5 | 3 | d = 1985-06-18 17:04:07+12:61 - | ^ -invalid time offset -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected minutes between 00 and 59 diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-minute-1digit.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-minute-1digit.stderr index a84588417..88c3ac9a0 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-minute-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-minute-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 33 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09:9 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected a two-digit minute (MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute-sep.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute-sep.stderr index 6825d9504..8e662fc7a 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+0909 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute.stderr index 38a715d66..8fc23c54a 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-hour-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 30 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+ - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected hour diff --git a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-minute.stderr b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-minute.stderr index a32eae1f5..4cb8178da 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/offset-plus-no-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/datetime/only-T.stderr b/crates/toml/tests/snapshots/invalid/datetime/only-T.stderr index 1bdce7fa7..bf0d470a7 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/only-T.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/only-T.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | foo = T | ^ -invalid string -expected `"`, `'` +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/datetime/only-TZ.stderr b/crates/toml/tests/snapshots/invalid/datetime/only-TZ.stderr index 434e82f18..592d375f7 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/only-TZ.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/only-TZ.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 7 | 1 | foo = TZ - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/datetime/only-Tdot.stderr b/crates/toml/tests/snapshots/invalid/datetime/only-Tdot.stderr index 68abfb162..2638ad154 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/only-Tdot.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/only-Tdot.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 7 | 1 | foo = T. - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/datetime/second-over.stderr b/crates/toml/tests/snapshots/invalid/datetime/second-over.stderr index 186a38dad..d4f52474e 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/second-over.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/second-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 22 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-01T00:00:61-00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected second between 00 and 60 diff --git a/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dot.stderr b/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dot.stderr index 556b93fe1..dfd3dcd63 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dot.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 26 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09. - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dotz.stderr b/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dotz.stderr index 11b227a36..afd82c125 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dotz.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/second-trailing-dotz.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 26 +TOML parse error at line 1, column 7 | 1 | foo = 2016-09-09T09:09:09.Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/datetime/time-no-leads.stderr b/crates/toml/tests/snapshots/invalid/datetime/time-no-leads.stderr index 012f62fd6..0f978753b 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/time-no-leads.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/time-no-leads.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 15 +TOML parse error at line 2, column 5 | 2 | d = 2023-10-01T1:32:00Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^ +invalid time, expected a two-digit hour (HH) diff --git a/crates/toml/tests/snapshots/invalid/datetime/trailing-x.stderr b/crates/toml/tests/snapshots/invalid/datetime/trailing-x.stderr index 53e06e43c..28836ad7b 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/trailing-x.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/trailing-x.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 16 +TOML parse error at line 1, column 6 | 1 | sign=2020-01-01x - | ^ -expected newline, `#` + | ^^^^^^^^^^^ +invalid date-time, expected `T` between date and time diff --git a/crates/toml/tests/snapshots/invalid/datetime/y10k.stderr b/crates/toml/tests/snapshots/invalid/datetime/y10k.stderr index dc5cfc587..3c0a1af75 100644 --- a/crates/toml/tests/snapshots/invalid/datetime/y10k.stderr +++ b/crates/toml/tests/snapshots/invalid/datetime/y10k.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 10000-01-01 00:00:00z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected a four-digit year (YYYY) diff --git a/crates/toml/tests/snapshots/invalid/encoding/ideographic-space.stderr b/crates/toml/tests/snapshots/invalid/encoding/ideographic-space.stderr index 6b27ec60e..077a2d301 100644 --- a/crates/toml/tests/snapshots/invalid/encoding/ideographic-space.stderr +++ b/crates/toml/tests/snapshots/invalid/encoding/ideographic-space.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | 　foo = "bar" - | ^^^ -invalid key + | ^ +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/encoding/utf16-comment.stderr b/crates/toml/tests/snapshots/invalid/encoding/utf16-comment.stderr index 688616546..bc9b3f0bb 100644 Binary files a/crates/toml/tests/snapshots/invalid/encoding/utf16-comment.stderr and b/crates/toml/tests/snapshots/invalid/encoding/utf16-comment.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/encoding/utf16-key.stderr b/crates/toml/tests/snapshots/invalid/encoding/utf16-key.stderr index 16bedc064..da52cd4d3 100644 Binary files a/crates/toml/tests/snapshots/invalid/encoding/utf16-key.stderr and b/crates/toml/tests/snapshots/invalid/encoding/utf16-key.stderr differ diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/day-1digit.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/day-1digit.stderr index 968a1b240..b3e00d99c 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/day-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/day-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 15 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-9 - | ^ -invalid date-time + | ^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/day-zero.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/day-zero.stderr index b79d7f54b..024839bee 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/day-zero.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/day-zero.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 15 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-00T09:09:09.09Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 30 diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/hour-too-large.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/hour-too-large.stderr index 4b9d5e079..62a4b9983 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/hour-too-large.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/hour-too-large.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 17 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T30:09:09.09Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected hour between 00 and 23 diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/minute-too-large.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/minute-too-large.stderr index 875bfa951..9e7f5abf5 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/minute-too-large.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/minute-too-large.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 21 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T12:69:09.09Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected minute between 00 and 59 diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/missing-date-time-sep.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/missing-date-time-sep.stderr index 3cd9fb107..37ba3dda7 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/missing-date-time-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/missing-date-time-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 17 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-0909:09:09 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/missing-year-month-sep.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/missing-year-month-sep.stderr index b003ff9da..1fc69e8c3 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/missing-year-month-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/missing-year-month-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 7 | 1 | foo = 199709-09 - | ^ -expected newline, `#` + | ^^^^^^^^^ +invalid date, expected `-` (MM-DD) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/month-1digit.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/month-1digit.stderr index 3b0568fe2..d3561e9ac 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/month-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/month-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 12 +TOML parse error at line 1, column 7 | 1 | foo = 1997-9-09 - | ^ -invalid date-time + | ^^^^^^^^^ +invalid date, expected a two-digit month (MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/month-zero.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/month-zero.stderr index b33c86384..d4300ed0e 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/month-zero.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/month-zero.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 12 +TOML parse error at line 1, column 7 | 1 | foo = 1997-00-09T09:09:09.09Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-minute-1digit.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-minute-1digit.stderr index a84588417..88c3ac9a0 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-minute-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-minute-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 33 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09:9 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected a two-digit minute (MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute-sep.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute-sep.stderr index 6825d9504..8e662fc7a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+0909 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute.stderr index 38a715d66..8fc23c54a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-hour-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 30 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+ - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected hour diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-minute.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-minute.stderr index a32eae1f5..4cb8178da 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-minus-missing-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-minute-1digit.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-minute-1digit.stderr index a84588417..88c3ac9a0 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-minute-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-minute-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 33 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09:9 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected a two-digit minute (MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute-sep.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute-sep.stderr index 6825d9504..8e662fc7a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute-sep.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute-sep.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+0909 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute.stderr index 38a715d66..8fc23c54a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-hour-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 30 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+ - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected hour diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-minute.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-minute.stderr index a32eae1f5..4cb8178da 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-minute.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/offset-plus-missing-minute.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 32 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09.09+09 - | ^ -invalid time offset + | ^^^^^^^^^^^^^^^^^^^^^^^^^ +invalid offset, expected `:` (HH:MM) diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/only-T.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/only-T.stderr index 1bdce7fa7..bf0d470a7 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/only-T.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/only-T.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | foo = T | ^ -invalid string -expected `"`, `'` +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/only-TZ.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/only-TZ.stderr index 434e82f18..592d375f7 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/only-TZ.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/only-TZ.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 7 | 1 | foo = TZ - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/only-Tdot.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/only-Tdot.stderr index 68abfb162..2638ad154 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/only-Tdot.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/only-Tdot.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 7 | 1 | foo = T. - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid boolean, expected `true` diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-too-large.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-too-large.stderr index 70da9a739..a2139c226 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-too-large.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-too-large.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 24 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T12:09:69.09Z - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected second between 00 and 60 diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal-z.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal-z.stderr index 11b227a36..afd82c125 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal-z.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal-z.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 26 +TOML parse error at line 1, column 7 | 1 | foo = 2016-09-09T09:09:09.Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal.stderr index 556b93fe1..dfd3dcd63 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/seconds-trailing-decimal.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 26 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-09T09:09:09. - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/ext/datetime/year-3digits.stderr b/crates/toml/tests/snapshots/invalid/ext/datetime/year-3digits.stderr index 08686b165..605d0c784 100644 --- a/crates/toml/tests/snapshots/invalid/ext/datetime/year-3digits.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/datetime/year-3digits.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 7 | 1 | foo = 199-09-09 - | ^ -expected newline, `#` + | ^^^^^^^^^ +invalid date, expected a four-digit year (YYYY) diff --git a/crates/toml/tests/snapshots/invalid/ext/float/overflow.stderr b/crates/toml/tests/snapshots/invalid/ext/float/overflow.stderr index 602d88d5e..1d9540bff 100644 --- a/crates/toml/tests/snapshots/invalid/ext/float/overflow.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/float/overflow.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 5 | 1 | a = 9e99999 - | ^ -invalid floating-point number + | ^^^^^^^ +floating-point number overflowed diff --git a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-minus.stderr b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-minus.stderr index 6db8553fa..69b9910d5 100644 --- a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-minus.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-minus.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 10 | 1 | a = 0.0e- | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-plus.stderr b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-plus.stderr index b1a746f98..efbef03bc 100644 --- a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp-plus.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 10 | 1 | a = 0.0e+ | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp.stderr b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp.stderr index f269ed6ae..4dd3cd233 100644 --- a/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/float/trailing-exp.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 9 | 1 | a = 0.0E | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/ext/float/trailing-point-exp.stderr b/crates/toml/tests/snapshots/invalid/ext/float/trailing-point-exp.stderr index 24de264f0..5b4411bfd 100644 --- a/crates/toml/tests/snapshots/invalid/ext/float/trailing-point-exp.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/float/trailing-point-exp.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | a = 0.e | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/ext/inline-table/comma.stderr b/crates/toml/tests/snapshots/invalid/ext/inline-table/comma.stderr index 019d1ec87..62b8a9797 100644 --- a/crates/toml/tests/snapshots/invalid/ext/inline-table/comma.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/inline-table/comma.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 8 | 1 | key = {,} | ^ -invalid inline table -expected `}` +extra comma in inline table, expected key diff --git a/crates/toml/tests/snapshots/invalid/ext/integer/invalid-hex-3.stderr b/crates/toml/tests/snapshots/invalid/ext/integer/invalid-hex-3.stderr index 9a644c8f8..56de2fe53 100644 --- a/crates/toml/tests/snapshots/invalid/ext/integer/invalid-hex-3.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/integer/invalid-hex-3.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 7 | 1 | a = 0x-1 | ^ -invalid hexadecimal integer +unexpected sign, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/ext/integer/overflow-neg.stderr b/crates/toml/tests/snapshots/invalid/ext/integer/overflow-neg.stderr index 12c04e693..63aa688f2 100644 --- a/crates/toml/tests/snapshots/invalid/ext/integer/overflow-neg.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/integer/overflow-neg.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 5 | 1 | a = -9223372036854775809 - | ^ -number too small to fit in target type + | ^^^^^^^^^^^^^^^^^^^^ +integer number overflowed diff --git a/crates/toml/tests/snapshots/invalid/ext/integer/overflow-pos.stderr b/crates/toml/tests/snapshots/invalid/ext/integer/overflow-pos.stderr index 1c0849df0..0029f00a7 100644 --- a/crates/toml/tests/snapshots/invalid/ext/integer/overflow-pos.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/integer/overflow-pos.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 5 | 1 | a = 9223372036854775808 - | ^ -number too large to fit in target type + | ^^^^^^^^^^^^^^^^^^^ +integer number overflowed diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/ml_basic_string.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/ml_basic_string.stderr index 34874ba50..b8db48b05 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/ml_basic_string.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/ml_basic_string.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | """key"""=3 - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/ml_literal.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/ml_literal.stderr index 54d769c01..0f9455c40 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/ml_literal.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/ml_literal.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | '''key'''=3 - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/newline-5.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/newline-5.stderr index ca077138b..7569a2e62 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/newline-5.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/newline-5.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 2, column 2 | -1 | key = - | ^ -invalid string -expected `"`, `'` +2 | 3 + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-1.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-1.stderr index 2392a481c..a9f2c94fa 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-1.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-1.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 5 | 1 | 0=0r=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-2.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-2.stderr index 039eb1ff3..f276cf705 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-2.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 5 | 1 | 0=""o=""m=""r=""00="0"q="""0"""e="""0""" | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-3.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-3.stderr index eff82e768..1a423a116 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-3.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-3.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 6 | 2 | 0="0"[[0000l0]] | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-4.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-4.stderr index 815c71720..25d4e6d35 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-4.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-4.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 6 | 1 | 0=[0]00=[0,0,0]t=["0","0","0"]s=[1000-00-00T00:00:00Z,2000-00-00T00:00:00Z] | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-5.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-5.stderr index 9d3f47a0c..1c5eda606 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-5.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-5.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 6 | 1 | 0=0r0=0r=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-6.stderr b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-6.stderr index 385ccafe0..e99e57121 100644 --- a/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-6.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/keys/no-eol-6.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 6 | 1 | 0=0r0=0r=falsefal=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/ext/string/bad-escape-6.stderr b/crates/toml/tests/snapshots/invalid/ext/string/bad-escape-6.stderr index 3bef7b264..c75e53428 100644 --- a/crates/toml/tests/snapshots/invalid/ext/string/bad-escape-6.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/string/bad-escape-6.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 9 | 1 | foo = "\" - | ^ -invalid basic string + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-array.stderr b/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-array.stderr index bc9aa2fa6..8494d7b64 100644 --- a/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-array.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-array.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 9 | 1 | name = [value] - | ^ -invalid array -expected `]` + | ^^^^^ +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-inline-table.stderr b/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-inline-table.stderr index 6d1a7fa13..c1fa3009b 100644 --- a/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-inline-table.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/string/missing-quotes-in-inline-table.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 16 | 1 | name = { key = value } - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-01.stderr b/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-01.stderr index 8967e36cb..c8840131a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-01.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 2, column 2 | -1 | a = " - | ^ -invalid basic string +2 | " + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-02.stderr b/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-02.stderr index 5c42917d2..191e83f3d 100644 --- a/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-02.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/string/no-close-recovery-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 2, column 2 | -1 | a = ' - | ^ -invalid literal string +2 | ' + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-3.stderr b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-3.stderr index e8f7af5ac..e14e36694 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-3.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-3.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 7, column 1 +TOML parse error at line 7, column 2 | 7 | [dependencies] - | ^ -invalid table header -duplicate key `dependencies` in document root + | ^^^^^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-4.stderr b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-4.stderr index a86281e94..a1cf87859 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-4.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-4.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | a.b = 2 - | ^ -duplicate key `b` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-5.stderr b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-5.stderr index 373f67874..6124bf57f 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-5.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-5.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 1 | 2 | a.b = 2 | ^ -dotted key `a` attempted to extend non-table type (integer) +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-6.stderr b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-6.stderr index 312acb1d3..2d2d3ec17 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-6.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/append-with-dotted-keys-6.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 14 | 1 | a = {k1 = 1, k1.name = "joe"} - | ^ -dotted key `k1` attempted to extend non-table type (integer) + | ^^ +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/bare-invalid-character.stderr b/crates/toml/tests/snapshots/invalid/ext/table/bare-invalid-character.stderr index c28b436bf..d23b8d3e5 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/bare-invalid-character.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/bare-invalid-character.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [!] | ^ -invalid key +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/dot.stderr b/crates/toml/tests/snapshots/invalid/ext/table/dot.stderr index 57a5546c1..6fb98e54f 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/dot.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/dot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [.] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-1.stderr b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-1.stderr index c56a130a2..8faf8d374 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-1.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-1.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 4 | 3 | [a.b] - | ^ -invalid table header -duplicate key `b` in table `a` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-empty-table.stderr b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-empty-table.stderr index 8a58939ae..686c2f06a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-empty-table.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-empty-table.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 5, column 1 +TOML parse error at line 5, column 2 | 5 | [a] - | ^ -invalid table header -duplicate key `a` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-table-array-3.stderr b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-table-array-3.stderr index 8c818fc1d..7ce3e72bb 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-table-array-3.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/duplicate-key-table-array-3.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | [[a.b]] - | ^ -invalid table header -dotted key `a` attempted to extend non-table type (array) + | ^ +cannot extend value of type array with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/ext/table/ml_basic_string.stderr b/crates/toml/tests/snapshots/invalid/ext/table/ml_basic_string.stderr index 9b16bf6d5..1afdacb30 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/ml_basic_string.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/ml_basic_string.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 2 | 1 | ["""table"""] - | ^ -invalid table header -expected `.`, `]` + | ^^^^^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/table/ml_literal.stderr b/crates/toml/tests/snapshots/invalid/ext/table/ml_literal.stderr index 87435f87e..6807f23f1 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/ml_literal.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/ml_literal.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 2 | 1 | ['''table'''] - | ^ -invalid table header -expected `.`, `]` + | ^^^^^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/ext/table/newline-1.stderr b/crates/toml/tests/snapshots/invalid/ext/table/newline-1.stderr index 13ba4d132..1c4ff7af3 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/newline-1.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/newline-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | [table | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/newline-2.stderr b/crates/toml/tests/snapshots/invalid/ext/table/newline-2.stderr index 77a4c44d9..ceb71044a 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/newline-2.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/newline-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 8 | 1 | ["table | ^ -invalid basic string +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-1.stderr b/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-1.stderr index 96bfcfc38..28c25a8ce 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-1.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-1.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 4 | 1 | ['] | ^ -invalid literal string +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-2.stderr b/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-2.stderr index 875421339..01c4d4803 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-2.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/quoted-unclosed-2.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 7 | 1 | ['''] - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/trailing-dot.stderr b/crates/toml/tests/snapshots/invalid/ext/table/trailing-dot.stderr index 5eb597037..303c380d7 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/trailing-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/trailing-dot.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 4 | 1 | [a.] - | ^ -invalid table header -expected `.`, `]` + | ^ +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/ext/table/value.stderr b/crates/toml/tests/snapshots/invalid/ext/table/value.stderr index 407e967f0..985ec6f45 100644 --- a/crates/toml/tests/snapshots/invalid/ext/table/value.stderr +++ b/crates/toml/tests/snapshots/invalid/ext/table/value.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 3 | 1 | '' | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/float/double-dot-01.stderr b/crates/toml/tests/snapshots/invalid/float/double-dot-01.stderr index 390520f7d..586197d88 100644 --- a/crates/toml/tests/snapshots/invalid/float/double-dot-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/double-dot-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | double-point-1 = 0..1 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/double-dot-02.stderr b/crates/toml/tests/snapshots/invalid/float/double-dot-02.stderr index a020a4846..8b1df55e8 100644 --- a/crates/toml/tests/snapshots/invalid/float/double-dot-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/double-dot-02.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | double-point-2 = 0.1.2 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/double-point-1.stderr b/crates/toml/tests/snapshots/invalid/float/double-point-1.stderr index 390520f7d..586197d88 100644 --- a/crates/toml/tests/snapshots/invalid/float/double-point-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/double-point-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | double-point-1 = 0..1 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/double-point-2.stderr b/crates/toml/tests/snapshots/invalid/float/double-point-2.stderr index a020a4846..8b1df55e8 100644 --- a/crates/toml/tests/snapshots/invalid/float/double-point-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/double-point-2.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | double-point-2 = 0.1.2 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/exp-dot-01.stderr b/crates/toml/tests/snapshots/invalid/float/exp-dot-01.stderr index 87f0a0b2e..10406b1f6 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-dot-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-dot-01.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 18 | 1 | exp-point-1 = 1e2.3 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/exp-dot-02.stderr b/crates/toml/tests/snapshots/invalid/float/exp-dot-02.stderr index 808905064..09100e35a 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-dot-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-dot-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | exp-point-2 = 1.e2 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-dot-03.stderr b/crates/toml/tests/snapshots/invalid/float/exp-dot-03.stderr index 873791caf..57111d0df 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-dot-03.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-dot-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | exp-point-3 = 3.e+20 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-double-e-01.stderr b/crates/toml/tests/snapshots/invalid/float/exp-double-e-01.stderr index 54118395c..28b81b4e4 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-double-e-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-double-e-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | exp-double-e-1 = 1ee2 | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-double-e-02.stderr b/crates/toml/tests/snapshots/invalid/float/exp-double-e-02.stderr index 1b99d374d..bfa21841b 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-double-e-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-double-e-02.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | exp-double-e-2 = 1e2e3 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/exp-double-e-1.stderr b/crates/toml/tests/snapshots/invalid/float/exp-double-e-1.stderr index 54118395c..28b81b4e4 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-double-e-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-double-e-1.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | exp-double-e-1 = 1ee2 | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-double-e-2.stderr b/crates/toml/tests/snapshots/invalid/float/exp-double-e-2.stderr index 1b99d374d..bfa21841b 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-double-e-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-double-e-2.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | exp-double-e-2 = 1e2e3 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/exp-double-us.stderr b/crates/toml/tests/snapshots/invalid/float/exp-double-us.stderr index 6a66e43d6..69335d2a5 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-double-us.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-double-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 19 | 1 | exp-double-us = 1e__23 | ^ -invalid floating-point number +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-leading-us.stderr b/crates/toml/tests/snapshots/invalid/float/exp-leading-us.stderr index 769668690..ed8aafa12 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-leading-us.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-leading-us.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | exp-leading-us = 1e_23 | ^ -invalid floating-point number +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-point-1.stderr b/crates/toml/tests/snapshots/invalid/float/exp-point-1.stderr index 87f0a0b2e..10406b1f6 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-point-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-point-1.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 18 | 1 | exp-point-1 = 1e2.3 - | ^ -expected newline, `#` + | ^^ +invalid float, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/exp-point-2.stderr b/crates/toml/tests/snapshots/invalid/float/exp-point-2.stderr index 808905064..09100e35a 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-point-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-point-2.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | exp-point-2 = 1.e2 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-point-3.stderr b/crates/toml/tests/snapshots/invalid/float/exp-point-3.stderr index 873791caf..57111d0df 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-point-3.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-point-3.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | exp-point-3 = 3.e+20 | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-01.stderr b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-01.stderr index 254bdf202..6f33f838d 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | exp-trailing-us-1 = 1_e2 - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-02.stderr b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-02.stderr index b2986ad6a..521d74260 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | exp-trailing-us-2 = 1.2_e2 - | ^ -invalid floating-point number -expected digit, digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-1.stderr b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-1.stderr index 254bdf202..6f33f838d 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-1.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | exp-trailing-us-1 = 1_e2 - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-2.stderr b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-2.stderr index b2986ad6a..521d74260 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us-2.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | exp-trailing-us-2 = 1.2_e2 - | ^ -invalid floating-point number -expected digit, digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us.stderr b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us.stderr index b7e2ad9cf..333f895b1 100644 --- a/crates/toml/tests/snapshots/invalid/float/exp-trailing-us.stderr +++ b/crates/toml/tests/snapshots/invalid/float/exp-trailing-us.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 24 +TOML parse error at line 1, column 23 | 1 | exp-trailing-us = 1e23_ - | ^ -invalid floating-point number -expected digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/inf-capital.stderr b/crates/toml/tests/snapshots/invalid/float/inf-capital.stderr index ca7a1b1b9..7c16ad611 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-capital.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-capital.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 5 | 1 | v = Inf - | ^ -invalid string -expected `"`, `'` + | ^^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-01.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-01.stderr index 99fe59b32..3066f7a8a 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-01.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 20 | 1 | inf-incomplete-1 = in - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-02.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-02.stderr index 38ef4cf4b..0c4e55e9b 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-02.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | inf-incomplete-2 = +in - | ^ -invalid integer + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-03.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-03.stderr index af66478ec..0e5bc2915 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-03.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-03.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | inf-incomplete-3 = -in - | ^ -invalid integer + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-1.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-1.stderr index 99fe59b32..3066f7a8a 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-1.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 20 | 1 | inf-incomplete-1 = in - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-2.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-2.stderr index 38ef4cf4b..0c4e55e9b 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-2.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | inf-incomplete-2 = +in - | ^ -invalid integer + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-3.stderr b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-3.stderr index af66478ec..0e5bc2915 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf-incomplete-3.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf-incomplete-3.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | inf-incomplete-3 = -in - | ^ -invalid integer + | ^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/inf_underscore.stderr b/crates/toml/tests/snapshots/invalid/float/inf_underscore.stderr index 825484291..72d07adfb 100644 --- a/crates/toml/tests/snapshots/invalid/float/inf_underscore.stderr +++ b/crates/toml/tests/snapshots/invalid/float/inf_underscore.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 18 | 1 | inf_underscore = in_f - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid float, expected `inf` diff --git a/crates/toml/tests/snapshots/invalid/float/leading-dot-neg.stderr b/crates/toml/tests/snapshots/invalid/float/leading-dot-neg.stderr index c46efe103..8190aac0b 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-dot-neg.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-dot-neg.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 22 +TOML parse error at line 1, column 21 | 1 | leading-point-neg = -.12345 - | ^ -invalid integer + | ^ +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-dot-plus.stderr b/crates/toml/tests/snapshots/invalid/float/leading-dot-plus.stderr index a643a7eef..67072c635 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-dot-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-dot-plus.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | leading-point-plus = +.12345 - | ^ -invalid integer + | ^ +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-dot.stderr b/crates/toml/tests/snapshots/invalid/float/leading-dot.stderr index 65e66b0cc..be1ceb0bc 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-dot.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | leading-point = .12345 | ^ -invalid floating-point number -expected leading digit +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-point-neg.stderr b/crates/toml/tests/snapshots/invalid/float/leading-point-neg.stderr index c46efe103..8190aac0b 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-point-neg.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-point-neg.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 22 +TOML parse error at line 1, column 21 | 1 | leading-point-neg = -.12345 - | ^ -invalid integer + | ^ +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-point-plus.stderr b/crates/toml/tests/snapshots/invalid/float/leading-point-plus.stderr index a643a7eef..67072c635 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-point-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-point-plus.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | leading-point-plus = +.12345 - | ^ -invalid integer + | ^ +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-point.stderr b/crates/toml/tests/snapshots/invalid/float/leading-point.stderr index 65e66b0cc..be1ceb0bc 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-point.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-point.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 17 | 1 | leading-point = .12345 | ^ -invalid floating-point number -expected leading digit +invalid mantissa, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/leading-us.stderr b/crates/toml/tests/snapshots/invalid/float/leading-us.stderr index e6d8e5235..8a6da84a4 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-us.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-us.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 14 | 1 | leading-us = _1.2 | ^ -invalid integer -expected leading digit +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/leading-zero-neg.stderr b/crates/toml/tests/snapshots/invalid/float/leading-zero-neg.stderr index a60ec4da5..a5175c4f0 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-zero-neg.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-zero-neg.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 22 +TOML parse error at line 1, column 21 | 1 | leading-zero-neg = -03.14 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/leading-zero-plus.stderr b/crates/toml/tests/snapshots/invalid/float/leading-zero-plus.stderr index f7c612b16..6b89fcaa6 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-zero-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-zero-plus.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | leading-zero-plus = +03.14 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/leading-zero.stderr b/crates/toml/tests/snapshots/invalid/float/leading-zero.stderr index 627650f81..b7385fb44 100644 --- a/crates/toml/tests/snapshots/invalid/float/leading-zero.stderr +++ b/crates/toml/tests/snapshots/invalid/float/leading-zero.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 17 +TOML parse error at line 1, column 16 | 1 | leading-zero = 03.14 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/nan-capital.stderr b/crates/toml/tests/snapshots/invalid/float/nan-capital.stderr index ae3b4d95f..158d52cb4 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-capital.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-capital.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 5 | 1 | v = NaN - | ^ -invalid string -expected `"`, `'` + | ^^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-01.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-01.stderr index 36faeb0be..a6b04d139 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-01.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 20 | 1 | nan-incomplete-1 = na - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-02.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-02.stderr index 38e01516c..d9d9c8e30 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-02.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | nan-incomplete-2 = +na - | ^ -invalid integer + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-03.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-03.stderr index e03ff4b92..26978d91d 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-03.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-03.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | nan-incomplete-3 = -na - | ^ -invalid integer + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-1.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-1.stderr index 36faeb0be..a6b04d139 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-1.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-1.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 20 | 1 | nan-incomplete-1 = na - | ^ -invalid string -expected `"`, `'` + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-2.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-2.stderr index 38e01516c..d9d9c8e30 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-2.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-2.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | nan-incomplete-2 = +na - | ^ -invalid integer + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-3.stderr b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-3.stderr index e03ff4b92..26978d91d 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan-incomplete-3.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan-incomplete-3.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 21 | 1 | nan-incomplete-3 = -na - | ^ -invalid integer + | ^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/nan_underscore.stderr b/crates/toml/tests/snapshots/invalid/float/nan_underscore.stderr index f6dead338..51d132007 100644 --- a/crates/toml/tests/snapshots/invalid/float/nan_underscore.stderr +++ b/crates/toml/tests/snapshots/invalid/float/nan_underscore.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 18 | 1 | nan_underscore = na_n - | ^ -invalid string -expected `"`, `'` + | ^^^^ +invalid float, expected `nan` diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-dot-01.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-dot-01.stderr index bd345d251..834b2794c 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-dot-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-dot-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | trailing-point = 1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-dot-02.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-dot-02.stderr index 07a723feb..6929d4cf7 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-dot-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-dot-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | a = 1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-dot-min.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-dot-min.stderr index 41f4ad9ce..42ca34cf2 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-dot-min.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-dot-min.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 25 | 1 | trailing-point-min = -1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-dot-plus.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-dot-plus.stderr index 9927935d0..1066c0dc2 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-dot-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-dot-plus.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 26 | 1 | trailing-point-plus = +1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-exp-minus.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-exp-minus.stderr index 1d14cc253..bc05b2832 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-exp-minus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-exp-minus.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 27 | 1 | trailing-exp-minus = 0.0e- | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-exp-plus.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-exp-plus.stderr index 5b0c39e92..b937e6771 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-exp-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-exp-plus.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 26 | 1 | trailing-exp-plus = 0.0e+ | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-exp-point.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-exp-point.stderr index 2600e249b..7dea83513 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-exp-point.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-exp-point.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 25 | 1 | trailing-exp-point = 0.e | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-exp.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-exp.stderr index f8179aca4..9c40a09e5 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-exp.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-exp.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | trailing-exp = 0.0E | ^ -invalid floating-point number +invalid exponent, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-point-min.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-point-min.stderr index 41f4ad9ce..42ca34cf2 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-point-min.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-point-min.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 25 | 1 | trailing-point-min = -1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-point-plus.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-point-plus.stderr index 9927935d0..1066c0dc2 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-point-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-point-plus.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 26 | 1 | trailing-point-plus = +1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-point.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-point.stderr index bd345d251..834b2794c 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-point.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-point.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | trailing-point = 1. | ^ -invalid floating-point number -expected digit +invalid fraction, expected digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-01.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-01.stderr index cf0fabc76..77cc1b27e 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-01.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | trailing-us-exp-1 = 1_e2 - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-02.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-02.stderr index 83ff1208f..dbe7a185d 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-02.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-us-exp-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | trailing-us-exp-2 = 1.2_e2 - | ^ -invalid floating-point number -expected digit, digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/trailing-us.stderr b/crates/toml/tests/snapshots/invalid/float/trailing-us.stderr index aa4f28897..88ade7284 100644 --- a/crates/toml/tests/snapshots/invalid/float/trailing-us.stderr +++ b/crates/toml/tests/snapshots/invalid/float/trailing-us.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | trailing-us = 1.2_ - | ^ -invalid floating-point number -expected digit, digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/float/us-after-dot.stderr b/crates/toml/tests/snapshots/invalid/float/us-after-dot.stderr index d93821dc5..3c165ca21 100644 --- a/crates/toml/tests/snapshots/invalid/float/us-after-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/float/us-after-dot.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | us-after-point = 1._2 | ^ -invalid floating-point number -expected digit +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/us-after-point.stderr b/crates/toml/tests/snapshots/invalid/float/us-after-point.stderr index d93821dc5..3c165ca21 100644 --- a/crates/toml/tests/snapshots/invalid/float/us-after-point.stderr +++ b/crates/toml/tests/snapshots/invalid/float/us-after-point.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 20 | 1 | us-after-point = 1._2 | ^ -invalid floating-point number -expected digit +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/us-before-dot.stderr b/crates/toml/tests/snapshots/invalid/float/us-before-dot.stderr index 109d8f71a..155bafc61 100644 --- a/crates/toml/tests/snapshots/invalid/float/us-before-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/float/us-before-dot.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 21 +TOML parse error at line 1, column 20 | 1 | us-before-point = 1_.2 - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/float/us-before-point.stderr b/crates/toml/tests/snapshots/invalid/float/us-before-point.stderr index 109d8f71a..155bafc61 100644 --- a/crates/toml/tests/snapshots/invalid/float/us-before-point.stderr +++ b/crates/toml/tests/snapshots/invalid/float/us-before-point.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 21 +TOML parse error at line 1, column 20 | 1 | us-before-point = 1_.2 - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/inline-table/bad-key-syntax.stderr b/crates/toml/tests/snapshots/invalid/inline-table/bad-key-syntax.stderr index c8ce45a61..9f4713aed 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/bad-key-syntax.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/bad-key-syntax.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 14 +TOML parse error at line 1, column 16 | 1 | tbl = { a = 1, [b] } - | ^ -invalid inline table -expected `}` + | ^ +missing key for inline table element, expected key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/double-comma.stderr b/crates/toml/tests/snapshots/invalid/inline-table/double-comma.stderr index ab4772b5a..eb5dc0dbb 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/double-comma.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/double-comma.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 9 +TOML parse error at line 1, column 10 | 1 | t = {x=3,,y=4} - | ^ -invalid inline table -expected `}` + | ^ +extra comma in inline table, expected key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-01.stderr index acee967ac..ff456c1e8 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 4 +TOML parse error at line 2, column 9 | 2 | a={b=1, b=2} - | ^ -duplicate key `b` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-02.stderr index 91b41fd67..4f199e198 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 11 +TOML parse error at line 1, column 36 | 1 | table1 = { table2.dupe = 1, table2.dupe = 2 } - | ^ -duplicate key `dupe` + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-03.stderr b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-03.stderr index 79a80410a..6835a86ca 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-03.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 42 | 1 | tbl = { fruit = { apple.color = "red" }, fruit.apple.texture = { smooth = true } } - | ^ -duplicate key `fruit` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-04.stderr b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-04.stderr index 7b8604481..e60d370c2 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-04.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/duplicate-key-04.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 24 | 1 | tbl = { a.b = "a_b", a.b.c = "a_b_c" } - | ^ -dotted key `a.b` attempted to extend non-table type (string) + | ^ +cannot extend value of type string with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/empty-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/empty-01.stderr index 0fcfd34f6..886d7720b 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/empty-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/empty-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | t = {,} | ^ -invalid inline table -expected `}` +extra comma in inline table, expected key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/empty-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/empty-02.stderr index ea51c1826..f34b64d78 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/empty-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/empty-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | t = {, | ^ -invalid inline table -expected `}` +extra comma in inline table, expected key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/empty-03.stderr b/crates/toml/tests/snapshots/invalid/inline-table/empty-03.stderr index ca4a29ab8..ef953e313 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/empty-03.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/empty-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | t = { | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-01.stderr index ed67c3ac7..670406270 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 3, column 18 | 3 | simple = { a = 1 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-02.stderr index a81575846..6e428e80e 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 9 +TOML parse error at line 1, column 10 | 1 | t = {a=1, - | ^ -invalid inline table -expected `}` + | ^ +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-03.stderr b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-03.stderr index 4aff61b76..c8790a2bc 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-03.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 9 | 1 | t = {a=1 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-04.stderr b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-04.stderr index 658456b86..763ecf076 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/linebreak-04.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/linebreak-04.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 14 | 1 | json_like = { | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/no-close-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/no-close-01.stderr index d371b65a1..e2deab791 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/no-close-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 4 | 1 | a={ | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/no-close-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/no-close-02.stderr index 3b42d7883..e38d03d23 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/no-close-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | a={b=1 | ^ -invalid inline table -expected `}` +newlines are unsupported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/inline-table/no-comma-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/no-comma-01.stderr index 89552182f..96b0af25a 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/no-comma-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/no-comma-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 12 +TOML parse error at line 1, column 14 | 1 | t = {x = 3 y = 4} - | ^ -invalid inline table -expected `}` + | ^ +extra assignment between key-value pairs, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr index 128ac5395..feeeaf427 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 31 +TOML parse error at line 1, column 42 | 1 | arrr = { comma-missing = true valid-toml = false } - | ^ -invalid inline table -expected `}` + | ^ +extra assignment between key-value pairs, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-01.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-01.stderr index 5c48ee223..60c93fad2 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-01.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 3, column 1 | 3 | a={} | ^ -duplicate key `a` in document root +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-02.stderr index 4108142dc..e2d3e1d2e 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-02.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 2 | 3 | [a.b] - | ^ -invalid table header -dotted key `a` attempted to extend non-table type (inline table) + | ^ +cannot extend value of type inline table with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-03.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-03.stderr index c1ab1d705..64d4c6382 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-03.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 1 | 2 | a.b = 2 | ^ -dotted key `a` attempted to extend non-table type (inline table) +cannot extend value of type inline table with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-04.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-04.stderr index 993e04e46..edc6fe8f3 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-04.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 3 | 3 | [[inline-t.nest]] - | ^ -invalid table header -dotted key `inline-t` attempted to extend non-table type (inline table) + | ^^^^^^^^ +cannot extend value of type inline table with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-05.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-05.stderr index bf1953da4..5535a24b4 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-05.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-05.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 2 | 3 | [inline-t.nest] - | ^ -invalid table header -dotted key `inline-t` attempted to extend non-table type (inline table) + | ^^^^^^^^ +cannot extend value of type inline table with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-06.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-06.stderr index 1e5d4cd79..fffb796bc 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-06.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-06.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 14 | 1 | a = { b = 1, b.c = 2 } - | ^ -dotted key `b` attempted to extend non-table type (integer) + | ^ +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-07.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-07.stderr index 9e5efba62..d85a7e8f7 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-07.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-07.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 35 | 1 | tab = { inner.table = [{}], inner.table.val = "bad" } - | ^ -dotted key `inner.table` attempted to extend non-table type (array) + | ^^^^^ +cannot extend value of type array with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-08.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-08.stderr index 832233088..faa5d3e5d 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-08.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-08.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 35 | 1 | tab = { inner = { dog = "best" }, inner.cat = "worst" } - | ^ -duplicate key `inner` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-09.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-09.stderr index 9d68dbbb1..9488b94d4 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-09.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-09.stderr @@ -1,5 +1,5 @@ TOML parse error at line 5, column 1 | 5 | nested.inline-t.nest = 2 - | ^ -duplicate key `nested` + | ^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-10.stderr b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-10.stderr index 18af75a00..df0b4c8b6 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/overwrite-10.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/overwrite-10.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 4, column 6 +TOML parse error at line 4, column 15 | 4 | a = {b.a = 1, b = 2, b.c = 3} - | ^ -duplicate key `b` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/inline-table/trailing-comma.stderr b/crates/toml/tests/snapshots/invalid/inline-table/trailing-comma.stderr index b17fca503..fb8fd8931 100644 --- a/crates/toml/tests/snapshots/invalid/inline-table/trailing-comma.stderr +++ b/crates/toml/tests/snapshots/invalid/inline-table/trailing-comma.stderr @@ -2,5 +2,4 @@ TOML parse error at line 3, column 18 | 3 | abc = { abc = 123, } | ^ -invalid inline table -expected `}` +trailing commas are not supported in inline tables, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/capital-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/capital-bin.stderr index 333ba92f8..7a62e2129 100644 --- a/crates/toml/tests/snapshots/invalid/integer/capital-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/capital-bin.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 16 +TOML parse error at line 1, column 15 | 1 | capital-bin = 0B0 - | ^ -expected newline, `#` + | ^^ +radix must be lowercase, expected `0b` diff --git a/crates/toml/tests/snapshots/invalid/integer/capital-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/capital-hex.stderr index ac064f9c4..82ca39788 100644 --- a/crates/toml/tests/snapshots/invalid/integer/capital-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/capital-hex.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 16 +TOML parse error at line 1, column 15 | 1 | capital-hex = 0X1 - | ^ -expected newline, `#` + | ^^ +radix must be lowercase, expected `0x` diff --git a/crates/toml/tests/snapshots/invalid/integer/capital-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/capital-oct.stderr index 774a8f2d6..af9c4a1a2 100644 --- a/crates/toml/tests/snapshots/invalid/integer/capital-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/capital-oct.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 16 +TOML parse error at line 1, column 15 | 1 | capital-oct = 0O0 - | ^ -expected newline, `#` + | ^^ +radix must be lowercase, expected `0o` diff --git a/crates/toml/tests/snapshots/invalid/integer/double-sign-nex.stderr b/crates/toml/tests/snapshots/invalid/integer/double-sign-nex.stderr index 542ba06bc..ef0c0d028 100644 --- a/crates/toml/tests/snapshots/invalid/integer/double-sign-nex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/double-sign-nex.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | double-sign-nex = --99 | ^ -invalid integer +redundant numeric sign, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/double-sign-plus.stderr b/crates/toml/tests/snapshots/invalid/integer/double-sign-plus.stderr index 8f8bad0fd..25da46c4d 100644 --- a/crates/toml/tests/snapshots/invalid/integer/double-sign-plus.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/double-sign-plus.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | double-sign-plus = ++99 | ^ -invalid integer +redundant numeric sign, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/double-us.stderr b/crates/toml/tests/snapshots/invalid/integer/double-us.stderr index e229868b0..6a3848eda 100644 --- a/crates/toml/tests/snapshots/invalid/integer/double-us.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/double-us.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 15 | 1 | double-us = 1__23 | ^ -invalid integer -expected digit +`_` may only go between digits diff --git a/crates/toml/tests/snapshots/invalid/integer/incomplete-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/incomplete-bin.stderr index 13d7b46ff..4dada44c3 100644 --- a/crates/toml/tests/snapshots/invalid/integer/incomplete-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/incomplete-bin.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 18 | 1 | incomplete-bin = 0b - | ^ -invalid binary integer + | ^^ +integer number overflowed diff --git a/crates/toml/tests/snapshots/invalid/integer/incomplete-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/incomplete-hex.stderr index ea5073a56..4616df2f3 100644 --- a/crates/toml/tests/snapshots/invalid/integer/incomplete-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/incomplete-hex.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 18 | 1 | incomplete-hex = 0x - | ^ -invalid hexadecimal integer + | ^^ +integer number overflowed diff --git a/crates/toml/tests/snapshots/invalid/integer/incomplete-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/incomplete-oct.stderr index 46d51c189..984404a63 100644 --- a/crates/toml/tests/snapshots/invalid/integer/incomplete-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/incomplete-oct.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 18 | 1 | incomplete-oct = 0o - | ^ -invalid octal integer + | ^^ +integer number overflowed diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-bin.stderr index 62c00fb28..a603a25ea 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-bin.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 20 | 1 | invalid-bin = 0b0012 | ^ -expected newline, `#` +invalid binary number diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-01.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-01.stderr index b899e6aa0..01830157b 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-01.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 22 | 1 | invalid-hex-1 = 0xaafz | ^ -expected newline, `#` +invalid hexadecimal number diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-02.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-02.stderr index 4df3e2fb9..9805b5135 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-02.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 19 | 1 | invalid-hex-2 = 0xgabba00f1 | ^ -invalid hexadecimal integer +invalid hexadecimal number diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-03.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-03.stderr index 9a644c8f8..56de2fe53 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-03.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 7 | 1 | a = 0x-1 | ^ -invalid hexadecimal integer +unexpected sign, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-1.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-1.stderr index b899e6aa0..01830157b 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-1.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-1.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 22 | 1 | invalid-hex-1 = 0xaafz | ^ -expected newline, `#` +invalid hexadecimal number diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-2.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-2.stderr index 4df3e2fb9..9805b5135 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-hex-2.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-hex-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 19 | 1 | invalid-hex-2 = 0xgabba00f1 | ^ -invalid hexadecimal integer +invalid hexadecimal number diff --git a/crates/toml/tests/snapshots/invalid/integer/invalid-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/invalid-oct.stderr index f3e1ada9b..7d4b18ff6 100644 --- a/crates/toml/tests/snapshots/invalid/integer/invalid-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/invalid-oct.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 19 | 1 | invalid-oct = 0o778 | ^ -expected newline, `#` +invalid octal number diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-us-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-us-bin.stderr index c979c1922..c3765b192 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-us-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-us-bin.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 18 | 1 | leading-us-bin = _0b1 | ^ -invalid integer -expected leading digit +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-us-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-us-hex.stderr index 1824a8b4a..5e330b9b3 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-us-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-us-hex.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 18 | 1 | leading-us-hex = _0x1 | ^ -invalid integer -expected leading digit +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-us-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-us-oct.stderr index c670551a3..fc139af4e 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-us-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-us-oct.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 18 | 1 | leading-us-oct = _0o1 | ^ -invalid integer -expected leading digit +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-us.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-us.stderr index f53275c0b..867f4bede 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-us.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-us.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 14 | 1 | leading-us = _123 | ^ -invalid integer -expected leading digit +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-01.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-01.stderr index f058a2d9e..33cbfe870 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-01.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-1 = 01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-02.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-02.stderr index 082381464..9968c9ddc 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-02.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-2 = 00 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-03.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-03.stderr index 7b0e481d0..168ac3d5d 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-03.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-3 = 0_0 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-1.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-1.stderr index f058a2d9e..33cbfe870 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-1.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-1.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-1 = 01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-2.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-2.stderr index 082381464..9968c9ddc 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-2.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-2.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-2 = 00 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-3.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-3.stderr index 7b0e481d0..168ac3d5d 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-3.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-3.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | leading-zero-3 = 0_0 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-01.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-01.stderr index 384c9d402..57c2072d8 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-01.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-1 = -01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-02.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-02.stderr index 795c3297f..3be1019a6 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-02.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-2 = +01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-03.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-03.stderr index 639aef5f1..c6b8d1fe2 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-03.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-3 = +0_1 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-1.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-1.stderr index 384c9d402..57c2072d8 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-1.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-1.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-1 = -01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-2.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-2.stderr index 795c3297f..3be1019a6 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-2.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-2.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-2 = +01 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-3.stderr b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-3.stderr index 639aef5f1..c6b8d1fe2 100644 --- a/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-3.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/leading-zero-sign-3.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 24 | 1 | leading-zero-sign-3 = +0_1 - | ^ -expected newline, `#` + | ^ +unexpected leading zero, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/negative-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/negative-bin.stderr index 7122d38f8..62df4210b 100644 --- a/crates/toml/tests/snapshots/invalid/integer/negative-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/negative-bin.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | negative-bin = -0b11010110 - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/negative-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/negative-hex.stderr index 0c7e58421..315b4c0fa 100644 --- a/crates/toml/tests/snapshots/invalid/integer/negative-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/negative-hex.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | negative-hex = -0xff - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/negative-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/negative-oct.stderr index 9e922c6e2..c0e3c65a2 100644 --- a/crates/toml/tests/snapshots/invalid/integer/negative-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/negative-oct.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | negative-oct = -0o755 - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/positive-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/positive-bin.stderr index bc5dc4ed3..631dfd88e 100644 --- a/crates/toml/tests/snapshots/invalid/integer/positive-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/positive-bin.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | positive-bin = +0b11010110 - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/positive-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/positive-hex.stderr index f57111431..ca51dadd3 100644 --- a/crates/toml/tests/snapshots/invalid/integer/positive-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/positive-hex.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | positive-hex = +0xff - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/positive-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/positive-oct.stderr index 30d2ab3b0..3e0dc9ccf 100644 --- a/crates/toml/tests/snapshots/invalid/integer/positive-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/positive-oct.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | positive-oct = +0o755 - | ^ -expected newline, `#` + | ^ +integers with a radix cannot be signed, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr b/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr index 0405cb410..367425700 100644 --- a/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 17 | 1 | answer = 42 the ultimate answer? - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/integer/trailing-us-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/trailing-us-bin.stderr index 7042a6e39..981906cc0 100644 --- a/crates/toml/tests/snapshots/invalid/integer/trailing-us-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/trailing-us-bin.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | trailing-us-bin = 0b1_ - | ^ -invalid binary integer -expected digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/trailing-us-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/trailing-us-hex.stderr index 9526a9489..564aa18f4 100644 --- a/crates/toml/tests/snapshots/invalid/integer/trailing-us-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/trailing-us-hex.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | trailing-us-hex = 0x1_ - | ^ -invalid hexadecimal integer -expected digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/trailing-us-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/trailing-us-oct.stderr index bb4330d0e..877102b13 100644 --- a/crates/toml/tests/snapshots/invalid/integer/trailing-us-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/trailing-us-oct.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 22 | 1 | trailing-us-oct = 0o1_ - | ^ -invalid octal integer -expected digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/trailing-us.stderr b/crates/toml/tests/snapshots/invalid/integer/trailing-us.stderr index f8c901ef4..98393b509 100644 --- a/crates/toml/tests/snapshots/invalid/integer/trailing-us.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/trailing-us.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 19 +TOML parse error at line 1, column 18 | 1 | trailing-us = 123_ - | ^ -invalid integer -expected digit + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/us-after-bin.stderr b/crates/toml/tests/snapshots/invalid/integer/us-after-bin.stderr index 1620bc6bc..233bf11d2 100644 --- a/crates/toml/tests/snapshots/invalid/integer/us-after-bin.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/us-after-bin.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | us-after-bin = 0b_1 - | ^ -invalid binary integer + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/us-after-hex.stderr b/crates/toml/tests/snapshots/invalid/integer/us-after-hex.stderr index e8283a070..8d8622b45 100644 --- a/crates/toml/tests/snapshots/invalid/integer/us-after-hex.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/us-after-hex.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | us-after-hex = 0x_1 - | ^ -invalid hexadecimal integer + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/integer/us-after-oct.stderr b/crates/toml/tests/snapshots/invalid/integer/us-after-oct.stderr index e6884d0c6..0758281c3 100644 --- a/crates/toml/tests/snapshots/invalid/integer/us-after-oct.stderr +++ b/crates/toml/tests/snapshots/invalid/integer/us-after-oct.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 18 +TOML parse error at line 1, column 16 | 1 | us-after-oct = 0o_1 - | ^ -invalid octal integer + | ^ +`_` may only go between digits, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/key/after-array.stderr b/crates/toml/tests/snapshots/invalid/key/after-array.stderr index 861f82d13..4848a601d 100644 --- a/crates/toml/tests/snapshots/invalid/key/after-array.stderr +++ b/crates/toml/tests/snapshots/invalid/key/after-array.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 14 | 1 | [[agencies]] owner = "S Cjelli" | ^ -invalid table header -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/after-table.stderr b/crates/toml/tests/snapshots/invalid/key/after-table.stderr index 499a43012..71acc6d95 100644 --- a/crates/toml/tests/snapshots/invalid/key/after-table.stderr +++ b/crates/toml/tests/snapshots/invalid/key/after-table.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 9 | 1 | [error] this = "should not be here" | ^ -invalid table header -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/after-value.stderr b/crates/toml/tests/snapshots/invalid/key/after-value.stderr index 9852ec8d0..8f19a519e 100644 --- a/crates/toml/tests/snapshots/invalid/key/after-value.stderr +++ b/crates/toml/tests/snapshots/invalid/key/after-value.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 15 | 1 | first = "Tom" last = "Preston-Werner" # INVALID | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-01.stderr b/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-01.stderr index bb943f88f..8fe747830 100644 --- a/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | ! = 123 | ^ -invalid key +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-02.stderr b/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-02.stderr index 0ba21fd81..085c90b14 100644 --- a/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/bare-invalid-character-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 5 | 1 | bare!key = 123 | ^ -expected `.`, `=` +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/dot.stderr b/crates/toml/tests/snapshots/invalid/key/dot.stderr index a23f91fa2..2f84dca4d 100644 --- a/crates/toml/tests/snapshots/invalid/key/dot.stderr +++ b/crates/toml/tests/snapshots/invalid/key/dot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | . = 1 | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/dotdot.stderr b/crates/toml/tests/snapshots/invalid/key/dotdot.stderr index 422179b35..c27d0c68e 100644 --- a/crates/toml/tests/snapshots/invalid/key/dotdot.stderr +++ b/crates/toml/tests/snapshots/invalid/key/dotdot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | .. = 1 | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-01.stderr b/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-01.stderr index f51a10828..f8d1b25ad 100644 --- a/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 1 | 2 | a.b = true | ^ -dotted key `a` attempted to extend non-table type (boolean) +cannot extend value of type boolean with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-02.stderr b/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-02.stderr index 3a2b8d5d9..4496bad18 100644 --- a/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/dotted-redefine-table-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 3 | 4 | a.b.c = 2 - | ^ -dotted key `a.b` attempted to extend non-table type (integer) + | ^ +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-01.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-01.stderr index c58dd3c3a..d7f27d5b4 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-01.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | name = "Pradyun" - | ^ -duplicate key `name` in document root + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-02.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-02.stderr index 74149f851..3cf5985e9 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-02.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | dupe = true - | ^ -duplicate key `dupe` in document root + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-03.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-03.stderr index 94a019fda..1993c4be7 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-03.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | "spelling" = "favourite" - | ^ -duplicate key `spelling` in document root + | ^^^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-04.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-04.stderr index 2bd02ab18..215f74b19 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-04.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-04.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | 'spelling' = "favourite" - | ^ -duplicate key `spelling` in document root + | ^^^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-05.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-05.stderr index 1a712e27b..a4f429ee3 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-05.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-05.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | "\u0061" = 1 - | ^ -duplicate key `a` in document root + | ^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-06.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-06.stderr index daccd7c3c..0da55ae13 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-06.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-06.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | "a\u0027b" = 2 - | ^ -duplicate key `a'b` in document root + | ^^^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-07.stderr b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-07.stderr index 090f39081..2960a15f5 100644 --- a/crates/toml/tests/snapshots/invalid/key/duplicate-keys-07.stderr +++ b/crates/toml/tests/snapshots/invalid/key/duplicate-keys-07.stderr @@ -1,5 +1,5 @@ TOML parse error at line 2, column 1 | 2 | "" = 2 - | ^ -duplicate key `` in document root + | ^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/key/empty.stderr b/crates/toml/tests/snapshots/invalid/key/empty.stderr index b859159f8..546ce23e0 100644 --- a/crates/toml/tests/snapshots/invalid/key/empty.stderr +++ b/crates/toml/tests/snapshots/invalid/key/empty.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | = 1 | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/end-in-escape.stderr b/crates/toml/tests/snapshots/invalid/key/end-in-escape.stderr index 5916980cd..4713cc7ad 100644 --- a/crates/toml/tests/snapshots/invalid/key/end-in-escape.stderr +++ b/crates/toml/tests/snapshots/invalid/key/end-in-escape.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 30 +TOML parse error at line 1, column 29 | 1 | "backslash is the last char\ - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/escape.stderr b/crates/toml/tests/snapshots/invalid/key/escape.stderr index 2a4ee3f72..8bf403b4f 100644 --- a/crates/toml/tests/snapshots/invalid/key/escape.stderr +++ b/crates/toml/tests/snapshots/invalid/key/escape.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | \u00c0 = "latin capital letter A with grave" | ^ -invalid key +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/hash.stderr b/crates/toml/tests/snapshots/invalid/key/hash.stderr index 15d8048ba..2156cb588 100644 --- a/crates/toml/tests/snapshots/invalid/key/hash.stderr +++ b/crates/toml/tests/snapshots/invalid/key/hash.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | a# = 1 | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/multiline-key-01.stderr b/crates/toml/tests/snapshots/invalid/key/multiline-key-01.stderr index ed02cd3df..67d62fd56 100644 --- a/crates/toml/tests/snapshots/invalid/key/multiline-key-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/multiline-key-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | """key""" = 1 - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/multiline-key-02.stderr b/crates/toml/tests/snapshots/invalid/key/multiline-key-02.stderr index ae5115dd7..7c2597b55 100644 --- a/crates/toml/tests/snapshots/invalid/key/multiline-key-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/multiline-key-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | '''key''' = 1 - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/multiline-key-03.stderr b/crates/toml/tests/snapshots/invalid/key/multiline-key-03.stderr index 2f010bb9d..3ec32e76d 100644 --- a/crates/toml/tests/snapshots/invalid/key/multiline-key-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/multiline-key-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | """key""" = """v""" - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/multiline-key-04.stderr b/crates/toml/tests/snapshots/invalid/key/multiline-key-04.stderr index 26a50caf5..774fa7ec4 100644 --- a/crates/toml/tests/snapshots/invalid/key/multiline-key-04.stderr +++ b/crates/toml/tests/snapshots/invalid/key/multiline-key-04.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | '''key''' = '''v''' - | ^ -expected `.`, `=` + | ^^^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/newline-01.stderr b/crates/toml/tests/snapshots/invalid/key/newline-01.stderr index 141932e42..b4bdddae8 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 8 | 1 | barekey | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/newline-02.stderr b/crates/toml/tests/snapshots/invalid/key/newline-02.stderr index ac205e186..d90408e6c 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 8 | 1 | "quoted | ^ -invalid basic string +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/newline-03.stderr b/crates/toml/tests/snapshots/invalid/key/newline-03.stderr index ee7c51937..66eb9dda6 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 8 | 1 | 'quoted | ^ -invalid literal string +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/newline-04.stderr b/crates/toml/tests/snapshots/invalid/key/newline-04.stderr index b4241ee9f..11d8c80aa 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-04.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-04.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | """long - | ^ -expected `.`, `=` + | ^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/newline-05.stderr b/crates/toml/tests/snapshots/invalid/key/newline-05.stderr index 18e3ab3b3..bb43e8d50 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-05.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-05.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 1 | 1 | '''long - | ^ -expected `.`, `=` + | ^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/key/newline-06.stderr b/crates/toml/tests/snapshots/invalid/key/newline-06.stderr index ca077138b..9ddb4c775 100644 --- a/crates/toml/tests/snapshots/invalid/key/newline-06.stderr +++ b/crates/toml/tests/snapshots/invalid/key/newline-06.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 2, column 2 | -1 | key = - | ^ -invalid string -expected `"`, `'` +2 | 1 + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-01.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-01.stderr index fc3c01ebf..24b156f02 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 7 +TOML parse error at line 1, column 9 | 1 | a = 1 b = 2 - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-02.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-02.stderr index 2392a481c..a9f2c94fa 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 5 | 1 | 0=0r=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-03.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-03.stderr index 039eb1ff3..f276cf705 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 5 | 1 | 0=""o=""m=""r=""00="0"q="""0"""e="""0""" | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-04.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-04.stderr index eff82e768..1a423a116 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-04.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 6 | 2 | 0="0"[[0000l0]] | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-05.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-05.stderr index 815c71720..25d4e6d35 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-05.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-05.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 6 | 1 | 0=[0]00=[0,0,0]t=["0","0","0"]s=[1000-00-00T00:00:00Z,2000-00-00T00:00:00Z] | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-06.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-06.stderr index 9d3f47a0c..1c5eda606 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-06.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-06.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 6 | 1 | 0=0r0=0r=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/no-eol-07.stderr b/crates/toml/tests/snapshots/invalid/key/no-eol-07.stderr index 385ccafe0..e99e57121 100644 --- a/crates/toml/tests/snapshots/invalid/key/no-eol-07.stderr +++ b/crates/toml/tests/snapshots/invalid/key/no-eol-07.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 6 | 1 | 0=0r0=0r=falsefal=false - | ^ -expected newline, `#` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/only-float.stderr b/crates/toml/tests/snapshots/invalid/key/only-float.stderr index a18915196..9cc615cf1 100644 --- a/crates/toml/tests/snapshots/invalid/key/only-float.stderr +++ b/crates/toml/tests/snapshots/invalid/key/only-float.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 4 | 1 | 1.1 | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/only-int.stderr b/crates/toml/tests/snapshots/invalid/key/only-int.stderr index 37574ba47..8dbdc78d4 100644 --- a/crates/toml/tests/snapshots/invalid/key/only-int.stderr +++ b/crates/toml/tests/snapshots/invalid/key/only-int.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | 1 | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/only-str.stderr b/crates/toml/tests/snapshots/invalid/key/only-str.stderr index 618baf305..09db5d65c 100644 --- a/crates/toml/tests/snapshots/invalid/key/only-str.stderr +++ b/crates/toml/tests/snapshots/invalid/key/only-str.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 3 | 1 | "" | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/open-bracket.stderr b/crates/toml/tests/snapshots/invalid/key/open-bracket.stderr index eee8cba03..90aafdb89 100644 --- a/crates/toml/tests/snapshots/invalid/key/open-bracket.stderr +++ b/crates/toml/tests/snapshots/invalid/key/open-bracket.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 5 | 1 | [abc = 1 - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr b/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr index e0a7c32ba..398cb7b70 100644 --- a/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr +++ b/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 8 | 1 | partial"quoted" = 5 | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-01.stderr b/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-01.stderr index 6f15232e8..ebefc981d 100644 --- a/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 9 | 1 | "key = x | ^ -invalid basic string +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-02.stderr b/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-02.stderr index f3fdc7f02..476d01310 100644 --- a/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/quoted-unclosed-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 5 | 1 | "key | ^ -invalid basic string +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/single-open-bracket.stderr b/crates/toml/tests/snapshots/invalid/key/single-open-bracket.stderr index 022f1fabc..01eb22007 100644 --- a/crates/toml/tests/snapshots/invalid/key/single-open-bracket.stderr +++ b/crates/toml/tests/snapshots/invalid/key/single-open-bracket.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [ | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/space.stderr b/crates/toml/tests/snapshots/invalid/key/space.stderr index cd3258b55..3c90dd902 100644 --- a/crates/toml/tests/snapshots/invalid/key/space.stderr +++ b/crates/toml/tests/snapshots/invalid/key/space.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 3 | 1 | a b = 1 | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/special-character.stderr b/crates/toml/tests/snapshots/invalid/key/special-character.stderr index 10592cfba..daace1035 100644 --- a/crates/toml/tests/snapshots/invalid/key/special-character.stderr +++ b/crates/toml/tests/snapshots/invalid/key/special-character.stderr @@ -1,5 +1,5 @@ TOML parse error at line 1, column 1 | 1 | μ = "greek small letter mu" - | ^^ -invalid key + | ^ +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/start-bracket.stderr b/crates/toml/tests/snapshots/invalid/key/start-bracket.stderr index 43f937b25..d8f25e413 100644 --- a/crates/toml/tests/snapshots/invalid/key/start-bracket.stderr +++ b/crates/toml/tests/snapshots/invalid/key/start-bracket.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 6 +TOML parse error at line 2, column 5 | 2 | [xyz = 5 - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/key/start-dot.stderr b/crates/toml/tests/snapshots/invalid/key/start-dot.stderr index c71f0cf53..8cec339d5 100644 --- a/crates/toml/tests/snapshots/invalid/key/start-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/key/start-dot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | .key = 1 | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/key/two-equals-01.stderr b/crates/toml/tests/snapshots/invalid/key/two-equals-01.stderr index 2f92886e1..93d611b73 100644 --- a/crates/toml/tests/snapshots/invalid/key/two-equals-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/two-equals-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | key= = 1 | ^ -invalid string -expected `"`, `'` +extra `=`, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/key/two-equals-02.stderr b/crates/toml/tests/snapshots/invalid/key/two-equals-02.stderr index f2adb1f33..e9e5d2a6a 100644 --- a/crates/toml/tests/snapshots/invalid/key/two-equals-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/two-equals-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 3 | 1 | a==1 | ^ -invalid string -expected `"`, `'` +extra `=`, expected nothing diff --git a/crates/toml/tests/snapshots/invalid/key/two-equals-03.stderr b/crates/toml/tests/snapshots/invalid/key/two-equals-03.stderr index dbee16973..70073b071 100644 --- a/crates/toml/tests/snapshots/invalid/key/two-equals-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/two-equals-03.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 4 | 1 | a=b=1 - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-01.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-01.stderr index 2ddb1240a..acd4dc504 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-01.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 4 | 1 | key | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-02.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-02.stderr index a3f280f72..d47cc3fe5 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-02.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | key = | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-03.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-03.stderr index a6ca6ffd6..d8331ddc5 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-03.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 6 | 1 | "key" | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-04.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-04.stderr index c14af0c30..c94b6eb77 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-04.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-04.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 9 | 1 | "key" = | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-05.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-05.stderr index 711eab123..1ee342aa6 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-05.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-05.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 6 | 1 | fs.fw | ^ -expected `.`, `=` +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-06.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-06.stderr index c380d700b..9b260c671 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-06.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-06.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 8 | 1 | fs.fw = | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/key/without-value-07.stderr b/crates/toml/tests/snapshots/invalid/key/without-value-07.stderr index 856583792..218aff8e5 100644 --- a/crates/toml/tests/snapshots/invalid/key/without-value-07.stderr +++ b/crates/toml/tests/snapshots/invalid/key/without-value-07.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 4 | 1 | fs. - | ^ -expected `.`, `=` + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/local-date/day-1digit.stderr b/crates/toml/tests/snapshots/invalid/local-date/day-1digit.stderr index 968a1b240..b3e00d99c 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/day-1digit.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/day-1digit.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 15 +TOML parse error at line 1, column 7 | 1 | foo = 1997-09-9 - | ^ -invalid date-time + | ^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/local-date/feb-29.stderr b/crates/toml/tests/snapshots/invalid/local-date/feb-29.stderr index b0ae76dda..c5e81451c 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/feb-29.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/feb-29.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 29 +TOML parse error at line 1, column 21 | 1 | "not a leap year" = 2100-02-29 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected day between 01 and 28 diff --git a/crates/toml/tests/snapshots/invalid/local-date/feb-30.stderr b/crates/toml/tests/snapshots/invalid/local-date/feb-30.stderr index 7f6434819..d7fb097e2 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/feb-30.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/feb-30.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 44 +TOML parse error at line 1, column 36 | 1 | "only 28 or 29 days in february" = 1988-02-30 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected day between 01 and 29 diff --git a/crates/toml/tests/snapshots/invalid/local-date/mday-over.stderr b/crates/toml/tests/snapshots/invalid/local-date/mday-over.stderr index f2d1876f4..637a495e0 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/mday-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/mday-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-32 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/local-date/mday-under.stderr b/crates/toml/tests/snapshots/invalid/local-date/mday-under.stderr index fab958d1c..5e7b8b099 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/mday-under.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/mday-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/local-date/month-over.stderr b/crates/toml/tests/snapshots/invalid/local-date/month-over.stderr index ec6d09096..d644cda3b 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/month-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/month-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2006-13-01 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/local-date/month-under.stderr b/crates/toml/tests/snapshots/invalid/local-date/month-under.stderr index 3e8324a7c..752998f07 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/month-under.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/month-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2007-00-01 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/local-date/no-leads-with-milli.stderr b/crates/toml/tests/snapshots/invalid/local-date/no-leads-with-milli.stderr index e0e3046ec..b4949f228 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/no-leads-with-milli.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/no-leads-with-milli.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 22 +TOML parse error at line 2, column 14 | 2 | with-milli = 1987-07-5 - | ^ -invalid date-time + | ^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/local-date/no-leads.stderr b/crates/toml/tests/snapshots/invalid/local-date/no-leads.stderr index e7b5d6962..9614d54af 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/no-leads.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/no-leads.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 17 +TOML parse error at line 2, column 12 | 2 | no-leads = 1987-7-05 - | ^ -invalid date-time + | ^^^^^^^^^ +invalid date, expected a two-digit month (MM) diff --git a/crates/toml/tests/snapshots/invalid/local-date/trailing-t.stderr b/crates/toml/tests/snapshots/invalid/local-date/trailing-t.stderr index 061ec2682..09c9feef9 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/trailing-t.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/trailing-t.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 15 +TOML parse error at line 2, column 5 | 2 | d = 2006-01-30T - | ^ -expected newline, `#` + | ^^^^^^^^^^^ +invalid time, expected hour diff --git a/crates/toml/tests/snapshots/invalid/local-date/y10k.stderr b/crates/toml/tests/snapshots/invalid/local-date/y10k.stderr index 244266e8f..787d9d470 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/y10k.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/y10k.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 10000-01-01 - | ^ -expected newline, `#` + | ^^^^^^^^^^^ +invalid date, expected a four-digit year (YYYY) diff --git a/crates/toml/tests/snapshots/invalid/local-date/year-3digits.stderr b/crates/toml/tests/snapshots/invalid/local-date/year-3digits.stderr index 08686b165..605d0c784 100644 --- a/crates/toml/tests/snapshots/invalid/local-date/year-3digits.stderr +++ b/crates/toml/tests/snapshots/invalid/local-date/year-3digits.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 7 | 1 | foo = 199-09-09 - | ^ -expected newline, `#` + | ^^^^^^^^^ +invalid date, expected a four-digit year (YYYY) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/feb-29.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/feb-29.stderr index 8aac71253..34d2328f1 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/feb-29.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/feb-29.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 29 +TOML parse error at line 1, column 21 | 1 | "not a leap year" = 2100-02-29T15:15:15 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 28 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/feb-30.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/feb-30.stderr index 6175c5e89..e7106e1d5 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/feb-30.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/feb-30.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 44 +TOML parse error at line 1, column 36 | 1 | "only 28 or 29 days in february" = 1988-02-30T15:15:15 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 29 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/hour-over.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/hour-over.stderr index bc255ed80..bf357433c 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/hour-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/hour-over.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 15 +TOML parse error at line 2, column 5 | 2 | d = 2006-01-01T24:00:00 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^ +invalid time, expected hour between 00 and 23 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/mday-over.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/mday-over.stderr index 0556e3ad0..9562524ac 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/mday-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/mday-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-32T00:00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/mday-under.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/mday-under.stderr index 036e96302..9792c9e1d 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/mday-under.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/mday-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 13 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-00T00:00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected day between 01 and 31 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/minute-over.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/minute-over.stderr index 039fc6eb3..88757519a 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/minute-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/minute-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 19 +TOML parse error at line 2, column 5 | 2 | d = 2006-01-01T00:60:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid time, expected minute between 00 and 59 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/month-over.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/month-over.stderr index 0d2dca24c..c5dea3975 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/month-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/month-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2006-13-01T00:00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/month-under.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/month-under.stderr index 6ce30cb7b..1e2aa2511 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/month-under.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/month-under.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 2007-00-01T00:00:00 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid date, expected month between 01 and 12 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/no-leads-with-milli.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/no-leads-with-milli.stderr index 5ec75e908..6a3e173c3 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/no-leads-with-milli.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/no-leads-with-milli.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 22 +TOML parse error at line 2, column 14 | 2 | with-milli = 1987-07-5T17:45:00.12 - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/no-leads.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/no-leads.stderr index 7d2c8791f..60292ffbf 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/no-leads.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/no-leads.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 17 +TOML parse error at line 2, column 12 | 2 | no-leads = 1987-7-05T17:45:00 - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit month (MM) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/no-secs.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/no-secs.stderr index 7585e1bfb..1644189c6 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/no-secs.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/no-secs.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 27 +TOML parse error at line 2, column 11 | 2 | no-secs = 1987-07-05T17:45 - | ^ -invalid date-time + | ^^^^^^^^^^^^^^^^ +invalid time, expected `:` (MM:SS) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/no-t.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/no-t.stderr index 0f520a2fe..08b46d04a 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/no-t.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/no-t.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 18 +TOML parse error at line 2, column 8 | 2 | no-t = 1987-07-0517:45:00 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^ +invalid date, expected a two-digit day (DD) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/second-over.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/second-over.stderr index 63d0007bb..13e150312 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/second-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/second-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 22 +TOML parse error at line 3, column 5 | 3 | d = 2006-01-01T00:00:61 - | ^ -invalid date-time -value is out of range + | ^^^^^^^^^^^^^^^^^^^ +invalid time, expected second between 00 and 60 diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/time-no-leads.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/time-no-leads.stderr index 012f62fd6..0f978753b 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/time-no-leads.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/time-no-leads.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 15 +TOML parse error at line 2, column 5 | 2 | d = 2023-10-01T1:32:00Z - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^ +invalid time, expected a two-digit hour (HH) diff --git a/crates/toml/tests/snapshots/invalid/local-datetime/y10k.stderr b/crates/toml/tests/snapshots/invalid/local-datetime/y10k.stderr index 2d4015dfe..4f31417f8 100644 --- a/crates/toml/tests/snapshots/invalid/local-datetime/y10k.stderr +++ b/crates/toml/tests/snapshots/invalid/local-datetime/y10k.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 10 +TOML parse error at line 2, column 5 | 2 | d = 10000-01-01 00:00:00 - | ^ -expected newline, `#` + | ^^^^^^^^^^^^^^^^^^^^ +invalid date, expected a four-digit year (YYYY) diff --git a/crates/toml/tests/snapshots/invalid/local-time/hour-over.stderr b/crates/toml/tests/snapshots/invalid/local-time/hour-over.stderr index 1f669e3a5..b329bfdd1 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/hour-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/hour-over.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 7 +TOML parse error at line 2, column 5 | 2 | d = 24:00:00 - | ^ -expected newline, `#` + | ^^^^^^^^ +invalid time, expected hour between 00 and 23 diff --git a/crates/toml/tests/snapshots/invalid/local-time/minute-over.stderr b/crates/toml/tests/snapshots/invalid/local-time/minute-over.stderr index efb676fa0..bd42a25d4 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/minute-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/minute-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 8 +TOML parse error at line 2, column 5 | 2 | d = 00:60:00 - | ^ -invalid time -value is out of range + | ^^^^^^^^ +invalid time, expected minute between 00 and 59 diff --git a/crates/toml/tests/snapshots/invalid/local-time/no-secs.stderr b/crates/toml/tests/snapshots/invalid/local-time/no-secs.stderr index 2fa8ba30d..d0c4e9c12 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/no-secs.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/no-secs.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 16 +TOML parse error at line 2, column 11 | 2 | no-secs = 17:45 - | ^ -invalid time + | ^^^^^ +invalid time, expected `:` (MM:SS) diff --git a/crates/toml/tests/snapshots/invalid/local-time/second-over.stderr b/crates/toml/tests/snapshots/invalid/local-time/second-over.stderr index a608f89d9..669e8c368 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/second-over.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/second-over.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 11 +TOML parse error at line 3, column 5 | 3 | d = 00:00:61 - | ^ -invalid time -value is out of range + | ^^^^^^^^ +invalid time, expected second between 00 and 60 diff --git a/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-01.stderr b/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-01.stderr index 7a9890229..fcb778084 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-01.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 6 +TOML parse error at line 2, column 5 | 2 | d = 1:32:00 - | ^ -expected newline, `#` + | ^^^^^^^ +invalid time, expected a two-digit hour (HH) diff --git a/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-02.stderr b/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-02.stderr index fd77fb297..b5d4eb6c1 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-02.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/time-no-leads-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 11 +TOML parse error at line 2, column 5 | 2 | d = 01:32:0 - | ^ -invalid time + | ^^^^^^^ +invalid time, expected a two-digit second (SS) diff --git a/crates/toml/tests/snapshots/invalid/local-time/trailing-dot.stderr b/crates/toml/tests/snapshots/invalid/local-time/trailing-dot.stderr index eb749ed63..87c517a54 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/trailing-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/trailing-dot.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 5 | 1 | t = 12:13:14. - | ^ -expected newline, `#` + | ^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/local-time/trailing-dotdot.stderr b/crates/toml/tests/snapshots/invalid/local-time/trailing-dotdot.stderr index e126a5deb..48e205063 100644 --- a/crates/toml/tests/snapshots/invalid/local-time/trailing-dotdot.stderr +++ b/crates/toml/tests/snapshots/invalid/local-time/trailing-dotdot.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 5 | 1 | t = 12:13:14.. - | ^ -expected newline, `#` + | ^^^^^^^^^^ +invalid time, expected nanosecond diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-2-0.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-2-0.stderr index 7fed2698e..1c57d9dfc 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-2-0.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-2-0.stderr @@ -1,5 +1,5 @@ TOML parse error at line 3, column 1 | 3 | type.edible = false # INVALID - | ^ -dotted key `type` attempted to extend non-table type (inline table) + | ^^^^ +cannot extend value of type inline table with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-3-0.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-3-0.stderr index 45ba696b9..216ffe843 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-3-0.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/inline-table-3-0.stderr @@ -1,5 +1,5 @@ TOML parse error at line 3, column 1 | 3 | type = { edible = false } # INVALID - | ^ -duplicate key `type` in table `product` + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/key-value-pair-1.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/key-value-pair-1.stderr index ba765a823..77bb8c162 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/key-value-pair-1.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/key-value-pair-1.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | key = # INVALID | ^ -invalid string -expected `"`, `'` +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/keys-2.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/keys-2.stderr index bdbcce45b..5313262a3 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/keys-2.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/keys-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 1 | 1 | = "no key name" # INVALID | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-4-0.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-4-0.stderr index e82601dd7..bb34d16fe 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-4-0.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-4-0.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 46 | 2 | str5 = """Here are three quotation marks: """.""" # INVALID | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-7-0.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-7-0.stderr index 7a928e190..0b1f1994e 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-7-0.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/string-7-0.stderr @@ -2,4 +2,4 @@ TOML parse error at line 3, column 48 | 3 | apos15 = '''Here are fifteen apostrophes: '''''''''''''''''' # INVALID | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-0.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-0.stderr index a2e1d4991..f1890d590 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-0.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-0.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 5, column 1 +TOML parse error at line 5, column 8 | 5 | [fruit.apple] # INVALID - | ^ -invalid table header -duplicate key `apple` in table `fruit` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-1.stderr b/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-1.stderr index 78dea2144..1769bcf7c 100644 --- a/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-1.stderr +++ b/crates/toml/tests/snapshots/invalid/spec-1.0.0/table-9-1.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 6, column 1 +TOML parse error at line 6, column 14 | 6 | [fruit.apple.taste] # INVALID - | ^ -invalid table header -duplicate key `taste` in table `fruit.apple` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/string/bad-byte-escape.stderr b/crates/toml/tests/snapshots/invalid/string/bad-byte-escape.stderr index 6d88863e2..ca8508711 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-byte-escape.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-byte-escape.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 14 +TOML parse error at line 1, column 13 | 1 | naughty = "\xAg" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-concat.stderr b/crates/toml/tests/snapshots/invalid/string/bad-concat.stderr index a7346a40e..c7c2861c9 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-concat.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-concat.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | no_concat = "first" "second" | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-escape-01.stderr b/crates/toml/tests/snapshots/invalid/string/bad-escape-01.stderr index 02cb48310..e446a66fe 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-escape-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-escape-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 43 +TOML parse error at line 1, column 42 | 1 | invalid-escape = "This string has a bad \a escape character." - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-escape-02.stderr b/crates/toml/tests/snapshots/invalid/string/bad-escape-02.stderr index 57f0acef5..7170591f4 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-escape-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-escape-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 43 +TOML parse error at line 1, column 42 | 1 | invalid-escape = "This string has a bad \ escape character." - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-escape-03.stderr b/crates/toml/tests/snapshots/invalid/string/bad-escape-03.stderr index ea108866f..f72a65504 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-escape-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-escape-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 16 +TOML parse error at line 1, column 15 | 1 | backslash = "\" - | ^ -invalid basic string + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-escape-04.stderr b/crates/toml/tests/snapshots/invalid/string/bad-escape-04.stderr index 8396da78b..4a2849563 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-escape-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-escape-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 12 +TOML parse error at line 1, column 11 | 1 | a = "a \\\ b" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-escape-05.stderr b/crates/toml/tests/snapshots/invalid/string/bad-escape-05.stderr index 59a8ac028..510869bbd 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-escape-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-escape-05.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 14 +TOML parse error at line 1, column 13 | 1 | a = "a \\\\\ b" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-01.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-01.stderr index 5d5577fa5..3a467d189 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-1 = "\x0g" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-02.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-02.stderr index 5a40ad444..c1096d10c 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-2 = "\xG0" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-03.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-03.stderr index 70e1183fd..af3e94348 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-03.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-3 = "\x" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-04.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-04.stderr index df028ee8b..c19165d13 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-4 = "\x 50" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-05.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-05.stderr index 4b5cd33d3..ed94fcb66 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-05.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-5 = "\x 50" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-1.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-1.stderr index 5d5577fa5..3a467d189 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-1.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-1.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-1 = "\x0g" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-2.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-2.stderr index 5a40ad444..c1096d10c 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-2.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-2.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-2 = "\xG0" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-3.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-3.stderr index 70e1183fd..af3e94348 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-3.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-3.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-3 = "\x" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-4.stderr b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-4.stderr index df028ee8b..c19165d13 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-4.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-hex-esc-4.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 19 | 1 | bad-hex-esc-4 = "\x 50" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-multiline.stderr b/crates/toml/tests/snapshots/invalid/string/bad-multiline.stderr index f88e0dd04..eeb8f7638 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-multiline.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-multiline.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 2, column 8 | -1 | multi = "first line - | ^ -invalid basic string +2 | second line" + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-slash-escape.stderr b/crates/toml/tests/snapshots/invalid/string/bad-slash-escape.stderr index 19bd111b2..635a96e95 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-slash-escape.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-slash-escape.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 43 +TOML parse error at line 1, column 42 | 1 | invalid-escape = "This string has a bad \/ escape character." - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-01.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-01.stderr index 71d8ed3b9..66ad4f459 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 24 | 1 | bad-uni-esc-1 = "val\ue" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-02.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-02.stderr index 06138c1db..fe59549cb 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | bad-uni-esc-2 = "val\Ux" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-03.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-03.stderr index c82355cb6..23d76e463 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 30 | 1 | bad-uni-esc-3 = "val\U0000000" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-04.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-04.stderr index 71fb48c97..d5cbdf311 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-04.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 27 | 1 | bad-uni-esc-4 = "val\U0000" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-05.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-05.stderr index d79798fc4..a3ef29a36 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-05.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | bad-uni-esc-5 = "val\Ugggggggg" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-06.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-06.stderr index 7eb5ff058..606f8ad5d 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-06.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-06.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 72 | 1 | bad-uni-esc-6 = "This string contains a non scalar unicode codepoint \uD801" | ^ -invalid unicode 4-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-07.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-07.stderr index c53ef125a..0de3cee5d 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-07.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-07.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 23 | 1 | bad-uni-esc-7 = "\uabag" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-1.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-1.stderr index 71d8ed3b9..66ad4f459 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-1.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-1.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 24 | 1 | bad-uni-esc-1 = "val\ue" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-2.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-2.stderr index 06138c1db..fe59549cb 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-2.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | bad-uni-esc-2 = "val\Ux" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-3.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-3.stderr index c82355cb6..23d76e463 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-3.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-3.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 30 | 1 | bad-uni-esc-3 = "val\U0000000" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-4.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-4.stderr index 71fb48c97..d5cbdf311 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-4.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-4.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 23 +TOML parse error at line 1, column 27 | 1 | bad-uni-esc-4 = "val\U0000" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-5.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-5.stderr index d79798fc4..a3ef29a36 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-5.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-5.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | bad-uni-esc-5 = "val\Ugggggggg" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-6.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-6.stderr index 7eb5ff058..606f8ad5d 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-6.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-6.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 72 | 1 | bad-uni-esc-6 = "This string contains a non scalar unicode codepoint \uD801" | ^ -invalid unicode 4-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-7.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-7.stderr index c53ef125a..0de3cee5d 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-7.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-7.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 20 +TOML parse error at line 1, column 23 | 1 | bad-uni-esc-7 = "\uabag" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-1.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-1.stderr index 959881f31..13f0fc57e 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-1.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-1.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 28 +TOML parse error at line 1, column 29 | 1 | bad-uni-esc-ml-1 = """val\ue""" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-2.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-2.stderr index ce6495240..720eec41b 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-2.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-2.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 28 | 1 | bad-uni-esc-ml-2 = """val\Ux""" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-3.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-3.stderr index 944889cf8..075b6005d 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-3.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-3.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 28 +TOML parse error at line 1, column 35 | 1 | bad-uni-esc-ml-3 = """val\U0000000""" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-4.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-4.stderr index bc6cc239d..18061f64f 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-4.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-4.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 28 +TOML parse error at line 1, column 32 | 1 | bad-uni-esc-ml-4 = """val\U0000""" - | ^ -invalid unicode 8-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-5.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-5.stderr index d643c0475..4d13011a4 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-5.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-5.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 28 | 1 | bad-uni-esc-ml-5 = """val\Ugggggggg""" | ^ -invalid unicode 8-digit hex code +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-6.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-6.stderr index 51e0de3a9..75169a463 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-6.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-6.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 77 | 1 | bad-uni-esc-ml-6 = """This string contains a non scalar unicode codepoint \uD801""" | ^ -invalid unicode 4-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-7.stderr b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-7.stderr index 55a5198ab..6c4ebf9e0 100644 --- a/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-7.stderr +++ b/crates/toml/tests/snapshots/invalid/string/bad-uni-esc-ml-7.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 28 | 1 | bad-uni-esc-ml-7 = """\uabag""" - | ^ -invalid unicode 4-digit hex code + | ^ +too few unicode value digits, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/basic-byte-escapes.stderr b/crates/toml/tests/snapshots/invalid/string/basic-byte-escapes.stderr index 64f8d8654..99d94112f 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-byte-escapes.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-byte-escapes.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 13 +TOML parse error at line 1, column 12 | 1 | answer = "\x33" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-01.stderr b/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-01.stderr index c4be6a6c8..952f88c7b 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 10 | 1 | a = """\UFFFFFFFF""" | ^ -invalid unicode 8-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-02.stderr b/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-02.stderr index f034203f8..644984975 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-multiline-out-of-range-unicode-escape-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 10 | 1 | a = """\U00D80000""" | ^ -invalid unicode 8-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/basic-multiline-quotes.stderr b/crates/toml/tests/snapshots/invalid/string/basic-multiline-quotes.stderr index 7a1600898..6cc168404 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-multiline-quotes.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-multiline-quotes.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 46 | 1 | str5 = """Here are three quotation marks: """.""" | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/basic-multiline-unknown-escape.stderr b/crates/toml/tests/snapshots/invalid/string/basic-multiline-unknown-escape.stderr index d2462bf13..bbab2450a 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-multiline-unknown-escape.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-multiline-unknown-escape.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 9 | 1 | a = """\@""" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-01.stderr b/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-01.stderr index 806e6e786..afe3603b0 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 8 | 1 | a = "\UFFFFFFFF" | ^ -invalid unicode 8-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-02.stderr b/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-02.stderr index 69396c669..c22f67ed8 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-out-of-range-unicode-escape-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 8 | 1 | a = "\U00D80000" | ^ -invalid unicode 8-digit hex code -value is out of range +invalid value, expected unicode hexadecimal value diff --git a/crates/toml/tests/snapshots/invalid/string/basic-unknown-escape.stderr b/crates/toml/tests/snapshots/invalid/string/basic-unknown-escape.stderr index a7fbb254e..a370e9cfa 100644 --- a/crates/toml/tests/snapshots/invalid/string/basic-unknown-escape.stderr +++ b/crates/toml/tests/snapshots/invalid/string/basic-unknown-escape.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 7 | 1 | a = "\@" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-01.stderr b/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-01.stderr index ed65b3342..59267bd95 100644 --- a/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 28 | 1 | a = '''6 apostrophes: '''''' | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-02.stderr b/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-02.stderr index 3fbb44acd..e409755a7 100644 --- a/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/literal-multiline-quotes-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 29 | 1 | a = '''15 apostrophes: '''''''''''''''''' | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/missing-quotes-array.stderr b/crates/toml/tests/snapshots/invalid/string/missing-quotes-array.stderr index bc9aa2fa6..8494d7b64 100644 --- a/crates/toml/tests/snapshots/invalid/string/missing-quotes-array.stderr +++ b/crates/toml/tests/snapshots/invalid/string/missing-quotes-array.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 9 | 1 | name = [value] - | ^ -invalid array -expected `]` + | ^^^^^ +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/string/missing-quotes-inline-table.stderr b/crates/toml/tests/snapshots/invalid/string/missing-quotes-inline-table.stderr index 6d1a7fa13..c1fa3009b 100644 --- a/crates/toml/tests/snapshots/invalid/string/missing-quotes-inline-table.stderr +++ b/crates/toml/tests/snapshots/invalid/string/missing-quotes-inline-table.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 16 | 1 | name = { key = value } - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/string/missing-quotes.stderr b/crates/toml/tests/snapshots/invalid/string/missing-quotes.stderr index 3558aab56..a876d33cc 100644 --- a/crates/toml/tests/snapshots/invalid/string/missing-quotes.stderr +++ b/crates/toml/tests/snapshots/invalid/string/missing-quotes.stderr @@ -1,6 +1,5 @@ TOML parse error at line 1, column 8 | 1 | name = value - | ^ -invalid string -expected `"`, `'` + | ^^^^^ +string values must be quoted, expected literal string diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-01.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-01.stderr index 1a3b24baf..846a91873 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 11 +TOML parse error at line 1, column 10 | 1 | k = """t\a""" - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +missing escaped value, expected `b`, `f`, `n`, `r`, `\`, `"`, `u`, `U` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-02.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-02.stderr index db17685ce..743e01a19 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 2, column 11 | 2 | k = """t\ t""" | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` +invalid multi-line basic string, expected newline diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-03.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-03.stderr index 646aa4d30..d6f9d7ff2 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 2, column 11 | 2 | k = """t\ """ | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` +invalid multi-line basic string, expected newline diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-04.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-04.stderr index d662a4db4..8dd3bbc1b 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-bad-escape-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | backslash = """\""" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-01.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-01.stderr index 4b3c32b98..f791403b1 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 2, column 9 | 2 | foo \ \n | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` +invalid multi-line basic string, expected newline diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-02.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-02.stderr index b5ed276f0..69d25e8f8 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-escape-space-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 7 +TOML parse error at line 4, column 9 | 4 | gee \ """ - | ^ -invalid escape sequence -expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"` + | ^ +invalid multi-line basic string, expected newline diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-01.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-01.stderr index 173193272..68d8bd9f5 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 20 | 2 | this will fail | ^ -invalid multiline literal string +invalid multi-line literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-02.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-02.stderr index 347c6de23..3b7ddf302 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 7 | 1 | x=''' | ^ -invalid multiline literal string +invalid multi-line literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-03.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-03.stderr index b6d5ec545..8556fc6e2 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 4, column 7 | 4 | eteta | ^ -invalid multiline literal string +invalid multi-line literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-04.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-04.stderr index 5dea96d9c..0cc6c776f 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-lit-no-close-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 3, column 8 | 3 | gee '' | ^ -invalid multiline literal string +invalid multi-line literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-01.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-01.stderr index 99e967a46..bebb37d0f 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 20 | 2 | this will fail | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-02.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-02.stderr index be5420add..91f092549 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 7 | 1 | x=""" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-03.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-03.stderr index eff9fe42e..4988ce676 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 4, column 7 | 4 | eteta | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-04.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-04.stderr index e19582f52..0aea9f56d 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 3, column 8 | 3 | gee "" | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-05.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-05.stderr index 00c17356c..3ce0dd60b 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-no-close-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-no-close-05.stderr @@ -2,4 +2,4 @@ TOML parse error at line 3, column 8 | 3 | gee\ | ^ -invalid multiline basic string +invalid multi-line basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/multiline-quotes-01.stderr b/crates/toml/tests/snapshots/invalid/string/multiline-quotes-01.stderr index c3cf4c6e5..59a887492 100644 --- a/crates/toml/tests/snapshots/invalid/string/multiline-quotes-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/multiline-quotes-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 23 | 1 | a = """6 quotes: """""" | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-01.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-01.stderr index f23223d3f..e6629ce8f 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 42 | 1 | no-ending-quote = "One time, at band camp | ^ -invalid basic string +invalid basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-02.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-02.stderr index a80fe60b4..ef8bfd442 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 29 | 1 | "a-string".must-be = "closed | ^ -invalid basic string +invalid basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-03.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-03.stderr index 029b40a83..92927199b 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 42 | 1 | no-ending-quote = 'One time, at band camp | ^ -invalid literal string +invalid literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-04.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-04.stderr index 9e47ef7a0..87c91fd25 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 29 | 1 | 'a-string'.must-be = 'closed | ^ -invalid literal string +invalid literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-05.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-05.stderr index 64940ccc4..b401a11ee 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-05.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 42 | 2 | no-ending-quote = "One time, at band camp | ^ -invalid basic string +invalid basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-06.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-06.stderr index 5b1bc93c8..b6349c25b 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-06.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-06.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 29 | 2 | "a-string".must-be = "closed | ^ -invalid basic string +invalid basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-07.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-07.stderr index b5993c630..c1442ae93 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-07.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-07.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 42 | 2 | no-ending-quote = 'One time, at band camp | ^ -invalid literal string +invalid literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-08.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-08.stderr index 2bd32af40..bb4c53495 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-08.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-08.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 29 | 2 | 'a-string'.must-be = 'closed | ^ -invalid literal string +invalid literal string, expected `'` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-09.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-09.stderr index 192e1cd37..da0b0d05f 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-09.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-09.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 6 +TOML parse error at line 3, column 2 | -2 | a = " - | ^ -invalid basic string +3 | " + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/string/no-close-10.stderr b/crates/toml/tests/snapshots/invalid/string/no-close-10.stderr index 20c4a19ff..ea5d0e3c4 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-close-10.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-close-10.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 6 +TOML parse error at line 3, column 2 | -2 | a = ' - | ^ -invalid literal string +3 | ' + | ^ +key with no value, expected `=` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr index 395b3ff9c..faf32ea81 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 5 +TOML parse error at line 1, column 6 | 1 | s = a" - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr index c2354bbc2..82ae01419 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 7 | 1 | a = [a"] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr index 4c19d54eb..3ddb124d6 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 5 +TOML parse error at line 1, column 6 | 1 | s = a' - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr index ced997049..e12e770ee 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 7 | 1 | a = [a'] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr index d79757814..4336d0f21 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 5 +TOML parse error at line 1, column 6 | 1 | a = a""" - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr index 67dcc6372..5cf761bf9 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 7 | 1 | a = [a"""] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr index 8beceea84..3a7684f9a 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 5 +TOML parse error at line 1, column 6 | 1 | a = a''' - | ^ -invalid string -expected `"`, `'` + | ^ +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr index 903c98de4..e0c03f535 100644 --- a/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr +++ b/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 7 | 1 | a = [a'''] - | ^ -invalid array -expected `]` + | ^ +missing comma between array elements, expected `,` diff --git a/crates/toml/tests/snapshots/invalid/string/text-after-string.stderr b/crates/toml/tests/snapshots/invalid/string/text-after-string.stderr index f05e33b53..cadbe3707 100644 --- a/crates/toml/tests/snapshots/invalid/string/text-after-string.stderr +++ b/crates/toml/tests/snapshots/invalid/string/text-after-string.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 41 | 1 | string = "Is there life after strings?" No. | ^ -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/string/wrong-close.stderr b/crates/toml/tests/snapshots/invalid/string/wrong-close.stderr index 9a785e050..5f02516b0 100644 --- a/crates/toml/tests/snapshots/invalid/string/wrong-close.stderr +++ b/crates/toml/tests/snapshots/invalid/string/wrong-close.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 39 | 1 | bad-ending-quote = "double and single' | ^ -invalid basic string +invalid basic string, expected `"` diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-01.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-01.stderr index 54ee50e1d..9749d73cc 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-01.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 17, column 3 +TOML parse error at line 17, column 5 | 17 | b.c.t = "Using dotted keys to add to [a.b.c] after explicitly defining it above is not allowed" - | ^ -duplicate key `c` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-02.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-02.stderr index 7c665f97b..0160798f5 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-02.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 8, column 3 +TOML parse error at line 8, column 7 | 8 | b.c.d.k.t = "Using dotted keys to add to [a.b.c.d] after explicitly defining it above is not allowed" - | ^ -duplicate key `d` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-03.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-03.stderr index 0fb4b2eb5..00529eb3c 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-03.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 3 | 4 | b.y = 2 - | ^ -duplicate key `y` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-04.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-04.stderr index e8f7af5ac..e14e36694 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-04.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 7, column 1 +TOML parse error at line 7, column 2 | 7 | [dependencies] - | ^ -invalid table header -duplicate key `dependencies` in document root + | ^^^^^^^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-05.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-05.stderr index a86281e94..a1cf87859 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-05.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-05.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | a.b = 2 - | ^ -duplicate key `b` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-06.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-06.stderr index 373f67874..6124bf57f 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-06.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-06.stderr @@ -2,4 +2,4 @@ TOML parse error at line 2, column 1 | 2 | a.b = 2 | ^ -dotted key `a` attempted to extend non-table type (integer) +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-07.stderr b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-07.stderr index 312acb1d3..2d2d3ec17 100644 --- a/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-07.stderr +++ b/crates/toml/tests/snapshots/invalid/table/append-with-dotted-keys-07.stderr @@ -1,5 +1,5 @@ -TOML parse error at line 1, column 6 +TOML parse error at line 1, column 14 | 1 | a = {k1 = 1, k1.name = "joe"} - | ^ -dotted key `k1` attempted to extend non-table type (integer) + | ^^ +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/table/array-empty.stderr b/crates/toml/tests/snapshots/invalid/table/array-empty.stderr index ad2440ac8..842c60871 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-empty.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-empty.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 3 | 1 | [[]] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/array-implicit.stderr b/crates/toml/tests/snapshots/invalid/table/array-implicit.stderr index ed1ab7fea..c0e9c7c9f 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-implicit.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-implicit.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 13, column 1 +TOML parse error at line 13, column 3 | 13 | [[albums]] - | ^ -invalid table header -duplicate key `albums` in document root + | ^^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/array-no-close-01.stderr b/crates/toml/tests/snapshots/invalid/table/array-no-close-01.stderr index ed370ef85..7924ed9fb 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-no-close-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 9 +TOML parse error at line 1, column 10 | 1 | [[albums] - | ^ -invalid table header -expected `.`, `]]` + | ^ +unclosed array table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/array-no-close-02.stderr b/crates/toml/tests/snapshots/invalid/table/array-no-close-02.stderr index a723c140b..f1d17e7fb 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-no-close-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 26 +TOML parse error at line 1, column 27 | 1 | [[closing-bracket.missing] - | ^ -invalid table header -expected `.`, `]]` + | ^ +unclosed array table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/array-no-close-03.stderr b/crates/toml/tests/snapshots/invalid/table/array-no-close-03.stderr index bf540035c..8869420d5 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-no-close-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 4 | 1 | [[a | ^ -invalid table header -expected `.`, `]]` +unclosed array table, expected `]]` diff --git a/crates/toml/tests/snapshots/invalid/table/array-no-close-04.stderr b/crates/toml/tests/snapshots/invalid/table/array-no-close-04.stderr index bf540035c..8869420d5 100644 --- a/crates/toml/tests/snapshots/invalid/table/array-no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/table/array-no-close-04.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 4 | 1 | [[a | ^ -invalid table header -expected `.`, `]]` +unclosed array table, expected `]]` diff --git a/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-01.stderr b/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-01.stderr index c28b436bf..d23b8d3e5 100644 --- a/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-01.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [!] | ^ -invalid key +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-02.stderr b/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-02.stderr index 2ed883a44..73c8c91fe 100644 --- a/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/bare-invalid-character-02.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | [bare!key] | ^ -invalid table header -expected `.`, `]` +invalid unquoted key, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/dot.stderr b/crates/toml/tests/snapshots/invalid/table/dot.stderr index 57a5546c1..6fb98e54f 100644 --- a/crates/toml/tests/snapshots/invalid/table/dot.stderr +++ b/crates/toml/tests/snapshots/invalid/table/dot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [.] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/dotdot.stderr b/crates/toml/tests/snapshots/invalid/table/dotdot.stderr index b9e8505fc..94a9c0b73 100644 --- a/crates/toml/tests/snapshots/invalid/table/dotdot.stderr +++ b/crates/toml/tests/snapshots/invalid/table/dotdot.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [..] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-01.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-01.stderr index 81bf4ed03..df1f65b8c 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 2 | 4 | [a] - | ^ -invalid table header -duplicate key `a` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-02.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-02.stderr index bc76d9ce0..4c8b7326e 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 8 | 4 | [fruit.type] - | ^ -invalid table header -duplicate key `type` in table `fruit` + | ^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-03.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-03.stderr index 0cf32abe5..faf07e20c 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-03.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 9 | 4 | [[fruit.apple]] - | ^ -invalid table header -duplicate key `apple` in table `fruit` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-04.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-04.stderr index 3cbc0a320..0ce791c07 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-04.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 8 | 4 | [fruit.apple] # INVALID - | ^ -invalid table header -duplicate key `apple` in table `fruit` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-05.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-05.stderr index c5ab1eb51..e0384a692 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-05.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-05.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 4, column 1 +TOML parse error at line 4, column 14 | 4 | [fruit.apple.taste] # INVALID - | ^ -invalid table header -duplicate key `taste` in table `fruit.apple` + | ^^^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-06.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-06.stderr index 536fdc3ba..a4c01661e 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-06.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-06.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | [[tbl]] - | ^ -invalid table header -duplicate key `tbl` in document root + | ^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-07.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-07.stderr index 81c27fba1..dfaaf7a71 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-07.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-07.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 2 | 2 | [tbl] - | ^ -invalid table header -duplicate key `tbl` in document root + | ^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-08.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-08.stderr index c56a130a2..8faf8d374 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-08.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-08.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 4 | 3 | [a.b] - | ^ -invalid table header -duplicate key `b` in table `a` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-09.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-09.stderr index 8a58939ae..686c2f06a 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-09.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-09.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 5, column 1 +TOML parse error at line 5, column 2 | 5 | [a] - | ^ -invalid table header -duplicate key `a` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/duplicate-key-10.stderr b/crates/toml/tests/snapshots/invalid/table/duplicate-key-10.stderr index 8c818fc1d..7ce3e72bb 100644 --- a/crates/toml/tests/snapshots/invalid/table/duplicate-key-10.stderr +++ b/crates/toml/tests/snapshots/invalid/table/duplicate-key-10.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | [[a.b]] - | ^ -invalid table header -dotted key `a` attempted to extend non-table type (array) + | ^ +cannot extend value of type array with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/table/empty-implicit-table.stderr b/crates/toml/tests/snapshots/invalid/table/empty-implicit-table.stderr index a7f7444e5..5f372bff0 100644 --- a/crates/toml/tests/snapshots/invalid/table/empty-implicit-table.stderr +++ b/crates/toml/tests/snapshots/invalid/table/empty-implicit-table.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 9 +TOML parse error at line 1, column 10 | 1 | [naughty..naughty] - | ^ -invalid table header -expected `.`, `]` + | ^ +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/empty.stderr b/crates/toml/tests/snapshots/invalid/table/empty.stderr index 5dd0d56b5..920161e5d 100644 --- a/crates/toml/tests/snapshots/invalid/table/empty.stderr +++ b/crates/toml/tests/snapshots/invalid/table/empty.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/equals-sign.stderr b/crates/toml/tests/snapshots/invalid/table/equals-sign.stderr index 52451c949..173250d7a 100644 --- a/crates/toml/tests/snapshots/invalid/table/equals-sign.stderr +++ b/crates/toml/tests/snapshots/invalid/table/equals-sign.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 6 | 1 | [name=bad] | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/llbrace.stderr b/crates/toml/tests/snapshots/invalid/table/llbrace.stderr index 316590da6..47c4e389b 100644 --- a/crates/toml/tests/snapshots/invalid/table/llbrace.stderr +++ b/crates/toml/tests/snapshots/invalid/table/llbrace.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 3 | 1 | [ [table]] | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/multiline-key-01.stderr b/crates/toml/tests/snapshots/invalid/table/multiline-key-01.stderr index 08b7a1f89..36fc697c7 100644 --- a/crates/toml/tests/snapshots/invalid/table/multiline-key-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/multiline-key-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 2 | 1 | ["""tbl"""] - | ^ -invalid table header -expected `.`, `]` + | ^^^^^^^^^ +keys cannot be multi-line basic strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/table/multiline-key-02.stderr b/crates/toml/tests/snapshots/invalid/table/multiline-key-02.stderr index aa3cd5311..bd99f5b9a 100644 --- a/crates/toml/tests/snapshots/invalid/table/multiline-key-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/multiline-key-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 2 | 1 | ['''tbl'''] - | ^ -invalid table header -expected `.`, `]` + | ^^^^^^^^^ +keys cannot be multi-line literal strings, expected basic string, literal string diff --git a/crates/toml/tests/snapshots/invalid/table/nested-brackets-close.stderr b/crates/toml/tests/snapshots/invalid/table/nested-brackets-close.stderr index e74e178f4..243503086 100644 --- a/crates/toml/tests/snapshots/invalid/table/nested-brackets-close.stderr +++ b/crates/toml/tests/snapshots/invalid/table/nested-brackets-close.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 4 | 1 | [a]b] | ^ -invalid table header -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/table/nested-brackets-open.stderr b/crates/toml/tests/snapshots/invalid/table/nested-brackets-open.stderr index 094cf7cde..f2edd4b50 100644 --- a/crates/toml/tests/snapshots/invalid/table/nested-brackets-open.stderr +++ b/crates/toml/tests/snapshots/invalid/table/nested-brackets-open.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 3 | 1 | [a[b] | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/newline-01.stderr b/crates/toml/tests/snapshots/invalid/table/newline-01.stderr index 8ec85d2ce..87de95254 100644 --- a/crates/toml/tests/snapshots/invalid/table/newline-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/newline-01.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 5 | 1 | [tbl | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/newline-02.stderr b/crates/toml/tests/snapshots/invalid/table/newline-02.stderr index 93646aa85..152c4832e 100644 --- a/crates/toml/tests/snapshots/invalid/table/newline-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/newline-02.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 6 | 1 | ["tbl | ^ -invalid basic string +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/newline-03.stderr b/crates/toml/tests/snapshots/invalid/table/newline-03.stderr index e1e2b1121..2618f1ad1 100644 --- a/crates/toml/tests/snapshots/invalid/table/newline-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/newline-03.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 7 | 1 | ["tbl" | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/newline-04.stderr b/crates/toml/tests/snapshots/invalid/table/newline-04.stderr index 2a437f1cf..a9f211507 100644 --- a/crates/toml/tests/snapshots/invalid/table/newline-04.stderr +++ b/crates/toml/tests/snapshots/invalid/table/newline-04.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 5 +TOML parse error at line 2, column 1 | -1 | [tbl. - | ^ -invalid table header -expected `.`, `]` +2 | ] + | ^ +missing table open, expected `[` diff --git a/crates/toml/tests/snapshots/invalid/table/newline-05.stderr b/crates/toml/tests/snapshots/invalid/table/newline-05.stderr index 8ec85d2ce..87de95254 100644 --- a/crates/toml/tests/snapshots/invalid/table/newline-05.stderr +++ b/crates/toml/tests/snapshots/invalid/table/newline-05.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 5 | 1 | [tbl | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-01.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-01.stderr index 2e184fa9e..983f770ca 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 7 | 1 | [where will it end - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-02.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-02.stderr index 26fc78756..30d27691a 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 25 +TOML parse error at line 1, column 26 | 1 | [closing-bracket.missingö - | ^^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-03.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-03.stderr index 2b05e95ae..5f2f8cdfe 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-03.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 21 | 1 | ["where will it end] | ^ -invalid basic string +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-04.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-04.stderr index 022f1fabc..01eb22007 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-04.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-04.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 2 | 1 | [ | ^ -invalid key +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-05.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-05.stderr index 38c7beed3..02d69c9b2 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-05.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-05.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 11 | 1 | [fwfw.wafw | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-06.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-06.stderr index 05e3eefea..9bd98f3a7 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-06.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-06.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 3 | 1 | [a | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-07.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-07.stderr index 96bfcfc38..28c25a8ce 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-07.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-07.stderr @@ -2,4 +2,4 @@ TOML parse error at line 1, column 4 | 1 | ['] | ^ -invalid literal string +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-08.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-08.stderr index 875421339..01c4d4803 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-08.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-08.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 4 +TOML parse error at line 1, column 7 | 1 | ['''] - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/no-close-09.stderr b/crates/toml/tests/snapshots/invalid/table/no-close-09.stderr index be1b333b5..2b091cbbd 100644 --- a/crates/toml/tests/snapshots/invalid/table/no-close-09.stderr +++ b/crates/toml/tests/snapshots/invalid/table/no-close-09.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 21 | 1 | ["where will it end""] | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/overwrite-array-in-parent.stderr b/crates/toml/tests/snapshots/invalid/table/overwrite-array-in-parent.stderr index 8a774ff73..a279abefc 100644 --- a/crates/toml/tests/snapshots/invalid/table/overwrite-array-in-parent.stderr +++ b/crates/toml/tests/snapshots/invalid/table/overwrite-array-in-parent.stderr @@ -1,5 +1,5 @@ TOML parse error at line 4, column 1 | 4 | arr = 2 - | ^ -duplicate key `arr` in table `parent-table` + | ^^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/overwrite-bool-with-array.stderr b/crates/toml/tests/snapshots/invalid/table/overwrite-bool-with-array.stderr index f52c7735e..a99d9fa07 100644 --- a/crates/toml/tests/snapshots/invalid/table/overwrite-bool-with-array.stderr +++ b/crates/toml/tests/snapshots/invalid/table/overwrite-bool-with-array.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 3 | 2 | [[a]] - | ^ -invalid table header -duplicate key `a` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/overwrite-with-deep-table.stderr b/crates/toml/tests/snapshots/invalid/table/overwrite-with-deep-table.stderr index 48773b6d6..100eacfb3 100644 --- a/crates/toml/tests/snapshots/invalid/table/overwrite-with-deep-table.stderr +++ b/crates/toml/tests/snapshots/invalid/table/overwrite-with-deep-table.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 2, column 1 +TOML parse error at line 2, column 2 | 2 | [a.b.c.d] - | ^ -invalid table header -dotted key `a` attempted to extend non-table type (integer) + | ^ +cannot extend value of type integer with a dotted key diff --git a/crates/toml/tests/snapshots/invalid/table/redefine-01.stderr b/crates/toml/tests/snapshots/invalid/table/redefine-01.stderr index 99c1f98a1..299b73ae7 100644 --- a/crates/toml/tests/snapshots/invalid/table/redefine-01.stderr +++ b/crates/toml/tests/snapshots/invalid/table/redefine-01.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 5, column 1 +TOML parse error at line 5, column 4 | 5 | [a.b] - | ^ -invalid table header -duplicate key `b` in table `a` + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/redefine-02.stderr b/crates/toml/tests/snapshots/invalid/table/redefine-02.stderr index 43bbb56c4..cc8a698d3 100644 --- a/crates/toml/tests/snapshots/invalid/table/redefine-02.stderr +++ b/crates/toml/tests/snapshots/invalid/table/redefine-02.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 5 | 3 | [t1.t2] - | ^ -invalid table header -duplicate key `t2` in table `t1` + | ^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/redefine-03.stderr b/crates/toml/tests/snapshots/invalid/table/redefine-03.stderr index 63bfc2403..b0a5d4dec 100644 --- a/crates/toml/tests/snapshots/invalid/table/redefine-03.stderr +++ b/crates/toml/tests/snapshots/invalid/table/redefine-03.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 8 | 3 | [t1.t2.t3] - | ^ -invalid table header -duplicate key `t3` in table `t1.t2` + | ^^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/rrbrace.stderr b/crates/toml/tests/snapshots/invalid/table/rrbrace.stderr index adcdf9043..a24de6376 100644 --- a/crates/toml/tests/snapshots/invalid/table/rrbrace.stderr +++ b/crates/toml/tests/snapshots/invalid/table/rrbrace.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 8 +TOML parse error at line 1, column 9 | 1 | [[table] ] - | ^ -invalid table header -expected `.`, `]]` + | ^ +unclosed array table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/super-twice.stderr b/crates/toml/tests/snapshots/invalid/table/super-twice.stderr index b36517abf..21e6ca071 100644 --- a/crates/toml/tests/snapshots/invalid/table/super-twice.stderr +++ b/crates/toml/tests/snapshots/invalid/table/super-twice.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 3, column 1 +TOML parse error at line 3, column 2 | 3 | [a] - | ^ -invalid table header -duplicate key `a` in document root + | ^ +duplicate key diff --git a/crates/toml/tests/snapshots/invalid/table/text-after-table.stderr b/crates/toml/tests/snapshots/invalid/table/text-after-table.stderr index e7d7c4eb5..c44fd84fb 100644 --- a/crates/toml/tests/snapshots/invalid/table/text-after-table.stderr +++ b/crates/toml/tests/snapshots/invalid/table/text-after-table.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 9 | 1 | [error] this shouldn't be here | ^ -invalid table header -expected newline, `#` +unexpected key or value, expected newline, `#` diff --git a/crates/toml/tests/snapshots/invalid/table/trailing-dot.stderr b/crates/toml/tests/snapshots/invalid/table/trailing-dot.stderr index 5eb597037..303c380d7 100644 --- a/crates/toml/tests/snapshots/invalid/table/trailing-dot.stderr +++ b/crates/toml/tests/snapshots/invalid/table/trailing-dot.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 3 +TOML parse error at line 1, column 4 | 1 | [a.] - | ^ -invalid table header -expected `.`, `]` + | ^ +unquoted keys cannot be empty, expected letters, numbers, `-`, `_` diff --git a/crates/toml/tests/snapshots/invalid/table/whitespace.stderr b/crates/toml/tests/snapshots/invalid/table/whitespace.stderr index aa149d2cb..56c595fee 100644 --- a/crates/toml/tests/snapshots/invalid/table/whitespace.stderr +++ b/crates/toml/tests/snapshots/invalid/table/whitespace.stderr @@ -1,6 +1,5 @@ -TOML parse error at line 1, column 10 +TOML parse error at line 1, column 9 | 1 | [invalid key] - | ^ -invalid table header -expected `.`, `]` + | ^ +unclosed table, expected `]` diff --git a/crates/toml/tests/snapshots/invalid/table/with-pound.stderr b/crates/toml/tests/snapshots/invalid/table/with-pound.stderr index f5531cc5d..c7fa37e89 100644 --- a/crates/toml/tests/snapshots/invalid/table/with-pound.stderr +++ b/crates/toml/tests/snapshots/invalid/table/with-pound.stderr @@ -2,5 +2,4 @@ TOML parse error at line 1, column 5 | 1 | [key#group] | ^ -invalid table header -expected `.`, `]` +unclosed table, expected `]` diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml index 4541e0778..854fdb1e0 100644 --- a/crates/toml_edit/Cargo.toml +++ b/crates/toml_edit/Cargo.toml @@ -27,11 +27,12 @@ pre-release-replacements = [ [features] default = ["parse", "display"] -parse = ["dep:winnow"] +parse = ["dep:toml_parse", "dep:winnow"] display = ["dep:toml_write"] -perf = ["dep:kstring"] +unsafe = ["toml_parse?/unsafe"] +perf = ["dep:kstring", "toml_parse?/simd"] serde = ["dep:serde", "toml_datetime/serde", "dep:serde_spanned"] -unstable-debug = ["winnow?/debug"] +unstable-debug = ["toml_parse?/debug", "dep:anstream", "dep:anstyle"] # Provide a method disable_recursion_limit to parse arbitrarily deep structures # without any consideration for overflowing the stack. Additionally you will # need to be careful around other recursive operations on the parsed result @@ -47,6 +48,9 @@ kstring = { version = "2.0.0", features = ["max_inline"], optional = true } toml_datetime = { version = "0.6.11", path = "../toml_datetime" } serde_spanned = { version = "0.6.9", path = "../serde_spanned", features = ["serde"], optional = true } toml_write = { version = "0.1.2", path = "../toml_write", optional = true } +toml_parse = { version = "0.1.0", path = "../toml_parse", optional = true } +anstream = { version = "0.6.15", optional = true } +anstyle = { version = "1.0.8", optional = true } [dev-dependencies] serde = { version = "1.0.199", features = ["derive"] } diff --git a/crates/toml_edit/src/document.rs b/crates/toml_edit/src/document.rs index 0cd40e77c..c16973138 100644 --- a/crates/toml_edit/src/document.rs +++ b/crates/toml_edit/src/document.rs @@ -23,7 +23,18 @@ impl ImDocument<&'static str> { impl> ImDocument { /// Parse a TOML document pub fn parse(raw: S) -> Result { - crate::parser::parse_document(raw) + let source = toml_parse::Source::new(raw.as_ref()); + let mut sink = crate::error::TomlSink::>::new(source); + let doc = crate::parser::parse_document(source, &mut sink); + if let Some(err) = sink.into_inner() { + Err(err) + } else { + Ok(ImDocument { + root: doc.root, + trailing: doc.trailing, + raw, + }) + } } } diff --git a/crates/toml_edit/src/error.rs b/crates/toml_edit/src/error.rs index 15bbb51cf..e40f4df9a 100644 --- a/crates/toml_edit/src/error.rs +++ b/crates/toml_edit/src/error.rs @@ -5,37 +5,47 @@ use std::fmt::{Display, Formatter, Result}; #[derive(Debug, Clone, Eq, PartialEq, Hash)] pub struct TomlError { message: String, - raw: Option, + raw: Option>, keys: Vec, span: Option>, } impl TomlError { #[cfg(feature = "parse")] - pub(crate) fn new( - error: winnow::error::ParseError< - crate::parser::prelude::Input<'_>, - winnow::error::ContextError, - >, - mut raw: crate::parser::prelude::Input<'_>, - ) -> Self { - use winnow::stream::Stream; - - let message = error.inner().to_string(); - let raw = raw.finish(); - let raw = String::from_utf8(raw.to_owned()).expect("original document was utf8"); + pub(crate) fn new(raw: std::sync::Arc, error: toml_parse::ParseError) -> Self { + let mut message = String::new(); + message.push_str(error.description()); + if let Some(expected) = error.expected() { + message.push_str(", expected "); + if expected.is_empty() { + message.push_str("nothing"); + } else { + for (i, expected) in expected.iter().enumerate() { + if i != 0 { + message.push_str(", "); + } + match expected { + toml_parse::Expected::Literal(desc) => { + message.push_str(&render_literal(desc)); + } + toml_parse::Expected::Description(desc) => message.push_str(desc), + _ => message.push_str("etc"), + } + } + } + } - let span = error.char_span(); + let span = error.unexpected().map(|span| span.start()..span.end()); Self { message, raw: Some(raw), keys: Vec::new(), - span: Some(span), + span, } } - #[cfg(any(feature = "serde", feature = "parse"))] + #[cfg(feature = "serde")] pub(crate) fn custom(message: String, span: Option>) -> Self { Self { message, @@ -67,7 +77,18 @@ impl TomlError { #[cfg(feature = "serde")] pub(crate) fn set_raw(&mut self, raw: Option) { - self.raw = raw; + self.raw = raw.map(|s| s.into()); + } +} + +fn render_literal(literal: &str) -> String { + match literal { + "\n" => "newline".to_owned(), + "`" => "'`'".to_owned(), + s if s.chars().all(|c| c.is_ascii_control()) => { + format!("`{}`", s.escape_debug()) + } + s => format!("`{s}`"), } } @@ -169,6 +190,52 @@ fn translate_position(input: &[u8], index: usize) -> (usize, usize) { (line, column) } +#[cfg(feature = "parse")] +pub(crate) struct TomlSink<'i, S> { + source: toml_parse::Source<'i>, + raw: Option>, + sink: S, +} + +#[cfg(feature = "parse")] +impl<'i, S: Default> TomlSink<'i, S> { + pub(crate) fn new(source: toml_parse::Source<'i>) -> Self { + Self { + source, + raw: None, + sink: Default::default(), + } + } + + pub(crate) fn into_inner(self) -> S { + self.sink + } +} + +#[cfg(feature = "parse")] +impl<'i> toml_parse::ErrorSink for TomlSink<'i, Option> { + fn report_error(&mut self, error: toml_parse::ParseError) { + if self.sink.is_none() { + let raw = self + .raw + .get_or_insert_with(|| std::sync::Arc::from(self.source.input())); + let error = TomlError::new(raw.clone(), error); + self.sink = Some(error); + } + } +} + +#[cfg(feature = "parse")] +impl<'i> toml_parse::ErrorSink for TomlSink<'i, Vec> { + fn report_error(&mut self, error: toml_parse::ParseError) { + let raw = self + .raw + .get_or_insert_with(|| std::sync::Arc::from(self.source.input())); + let error = TomlError::new(raw.clone(), error); + self.sink.push(error); + } +} + #[cfg(test)] mod test_translate_position { use super::*; diff --git a/crates/toml_edit/src/internal_string.rs b/crates/toml_edit/src/internal_string.rs index 39d705907..84f1be495 100644 --- a/crates/toml_edit/src/internal_string.rs +++ b/crates/toml_edit/src/internal_string.rs @@ -87,6 +87,16 @@ impl From<&InternalString> for InternalString { } } +impl From> for InternalString { + #[inline] + fn from(s: std::borrow::Cow<'_, str>) -> Self { + match s { + std::borrow::Cow::Borrowed(s) => s.into(), + std::borrow::Cow::Owned(s) => s.into(), + } + } +} + impl From> for InternalString { #[inline] fn from(s: Box) -> Self { diff --git a/crates/toml_edit/src/key.rs b/crates/toml_edit/src/key.rs index dc36943af..53f71fd20 100644 --- a/crates/toml_edit/src/key.rs +++ b/crates/toml_edit/src/key.rs @@ -174,18 +174,30 @@ impl Key { #[cfg(feature = "parse")] fn try_parse_simple(s: &str) -> Result { - let mut key = crate::parser::parse_key(s)?; - key.despan(s); - Ok(key) + let source = toml_parse::Source::new(s); + let mut sink = crate::error::TomlSink::>::new(source); + let mut key = crate::parser::parse_key(source, &mut sink); + if let Some(err) = sink.into_inner() { + Err(err) + } else { + key.despan(s); + Ok(key) + } } #[cfg(feature = "parse")] fn try_parse_path(s: &str) -> Result, crate::TomlError> { - let mut keys = crate::parser::parse_key_path(s)?; - for key in &mut keys { - key.despan(s); + let source = toml_parse::Source::new(s); + let mut sink = crate::error::TomlSink::>::new(source); + let mut keys = crate::parser::parse_key_path(source, &mut sink); + if let Some(err) = sink.into_inner() { + Err(err) + } else { + for key in &mut keys { + key.despan(s); + } + Ok(keys) } - Ok(keys) } } diff --git a/crates/toml_edit/src/parser/array.rs b/crates/toml_edit/src/parser/array.rs index d1e14f3ca..46d2c6b79 100644 --- a/crates/toml_edit/src/parser/array.rs +++ b/crates/toml_edit/src/parser/array.rs @@ -1,134 +1,151 @@ -use winnow::combinator::cut_err; -use winnow::combinator::delimited; -use winnow::combinator::opt; -use winnow::combinator::peek; -use winnow::combinator::separated; -use winnow::combinator::trace; - -use crate::parser::trivia::ws_comment_newline; -use crate::parser::value::value; -use crate::{Array, Item, RawString}; +use crate::parser::inline_table::on_inline_table; +use crate::parser::value::on_scalar; +use crate::{Array, RawString, Value}; use crate::parser::prelude::*; -// ;; Array - -// array = array-open array-values array-close -pub(crate) fn array<'i>(input: &mut Input<'i>) -> ModalResult { - trace("array", move |input: &mut Input<'i>| { - delimited( - ARRAY_OPEN, - cut_err(array_values), - cut_err(ARRAY_CLOSE) - .context(StrContext::Label("array")) - .context(StrContext::Expected(StrContextValue::CharLiteral(']'))), - ) - .parse_next(input) - }) - .parse_next(input) -} - -// note: we're omitting ws and newlines here, because -// they should be part of the formatted values -// array-open = %x5B ws-newline ; [ -pub(crate) const ARRAY_OPEN: u8 = b'['; -// array-close = ws-newline %x5D ; ] -const ARRAY_CLOSE: u8 = b']'; -// array-sep = ws %x2C ws ; , Comma -const ARRAY_SEP: u8 = b','; - -// array-values = ws-comment-newline val ws-comment-newline array-sep array-values -// array-values =/ ws-comment-newline val ws-comment-newline [ array-sep ] -fn array_values(input: &mut Input<'_>) -> ModalResult { - if peek(opt(ARRAY_CLOSE)).parse_next(input)?.is_some() { - // Optimize for empty arrays, avoiding `value` from being expected to fail - return Ok(Array::new()); - } - - let array = separated(0.., array_value, ARRAY_SEP).parse_next(input)?; - let mut array = Array::with_vec(array); - if !array.is_empty() { - let comma = opt(ARRAY_SEP).parse_next(input)?.is_some(); - array.set_trailing_comma(comma); +/// ```bnf +/// ;; Array +/// +/// array = array-open array-values array-close +/// array-values = ws-comment-newline val ws-comment-newline array-sep array-values +/// array-values =/ ws-comment-newline val ws-comment-newline [ array-sep ] +/// ``` +pub(crate) fn on_array( + open_event: &toml_parse::parser::Event, + input: &mut Input<'_>, + source: toml_parse::Source<'_>, + errors: &mut dyn ErrorSink, +) -> Array { + #[cfg(feature = "unstable-debug")] + let _scope = TraceScope::new("array::on_array"); + let mut result = Array::new(); + + let mut state = State::default(); + while let Some(event) = input.next_token() { + match event.kind() { + EventKind::StdTableOpen + | EventKind::ArrayTableOpen + | EventKind::InlineTableClose + | EventKind::SimpleKey + | EventKind::KeySep + | EventKind::KeyValSep + | EventKind::StdTableClose + | EventKind::ArrayTableClose => { + #[cfg(feature = "unstable-debug")] + trace( + &format!("unexpected {event:?}"), + anstyle::AnsiColor::Red.on_default(), + ); + break; + } + EventKind::Error => { + #[cfg(feature = "unstable-debug")] + trace( + &format!("unexpected {event:?}"), + anstyle::AnsiColor::Red.on_default(), + ); + continue; + } + EventKind::InlineTableOpen => { + let value = on_inline_table(event, input, source, errors); + state.capture_value(event, Value::InlineTable(value)); + } + EventKind::ArrayOpen => { + let value = on_array(event, input, source, errors); + state.capture_value(event, Value::Array(value)); + } + EventKind::Scalar => { + let value = on_scalar(event, source, errors); + state.capture_value(event, value); + } + EventKind::ValueSep => { + state.finish_value(event, &mut result); + state.sep_value(event); + } + EventKind::Whitespace | EventKind::Comment | EventKind::Newline => { + state.whitespace(event); + } + EventKind::ArrayClose => { + state.finish_value(event, &mut result); + state.close(open_event, event, &mut result); + break; + } + } } - let trailing = ws_comment_newline.span().parse_next(input)?; - array.set_trailing(RawString::with_span(trailing)); - Ok(array) + result } -fn array_value(input: &mut Input<'_>) -> ModalResult { - let prefix = ws_comment_newline.span().parse_next(input)?; - let value = value.parse_next(input)?; - let suffix = ws_comment_newline.span().parse_next(input)?; - let value = value.decorated(RawString::with_span(prefix), RawString::with_span(suffix)); - let value = Item::Value(value); - Ok(value) +#[derive(Default)] +struct State { + current_prefix: Option, + current_value: Option, + trailing_start: Option, + current_suffix: Option, } -#[cfg(test)] -#[cfg(feature = "parse")] -#[cfg(feature = "display")] -mod test { - use super::*; - - #[test] - fn arrays() { - let inputs = [ - r#"[]"#, - r#"[ ]"#, - r#"[ - 1, 2, 3 -]"#, - r#"[ - 1, - 2, # this is ok -]"#, - r#"[# comment -# comment2 - +impl State { + fn whitespace(&mut self, event: &toml_parse::parser::Event) { + let decor = if self.is_prefix() { + self.current_prefix.get_or_insert(event.span()) + } else { + self.current_suffix.get_or_insert(event.span()) + }; + *decor = decor.append(event.span()); + } - ]"#, - r#"[# comment -# comment2 - 1 + fn is_prefix(&self) -> bool { + self.current_value.is_none() + } -#sd -, -# comment3 + fn capture_value(&mut self, event: &toml_parse::parser::Event, value: Value) { + self.trailing_start = None; + self.current_prefix + .get_or_insert_with(|| event.span().before()); + self.current_value = Some(value); + } - ]"#, - r#"[1]"#, - r#"[1,]"#, - r#"[ "all", 'strings', """are the same""", '''type''']"#, - r#"[ 100, -2,]"#, - r#"[1, 2, 3]"#, - r#"[1.1, 2.1, 3.1]"#, - r#"["a", "b", "c"]"#, - r#"[ [ 1, 2 ], [3, 4, 5] ]"#, - r#"[ [ 1, 2 ], ["a", "b", "c"] ]"#, - r#"[ { x = 1, a = "2" }, {a = "a",b = "b", c = "c"} ]"#, - ]; - for input in inputs { - dbg!(input); - let mut parsed = array.parse(new_input(input)); - if let Ok(parsed) = &mut parsed { - parsed.despan(input); - } - assert_eq!(parsed.map(|a| a.to_string()), Ok(input.to_owned())); + fn finish_value(&mut self, event: &toml_parse::parser::Event, result: &mut Array) { + #[cfg(feature = "unstable-debug")] + let _scope = TraceScope::new("array::finish_value"); + if let Some(mut value) = self.current_value.take() { + let prefix = self + .current_prefix + .take() + .expect("setting a value should set a prefix"); + let suffix = self + .current_suffix + .take() + .unwrap_or_else(|| event.span().before()); + let decor = value.decor_mut(); + decor.set_prefix(RawString::with_span(prefix.start()..prefix.end())); + decor.set_suffix(RawString::with_span(suffix.start()..suffix.end())); + result.push_formatted(value); } } - #[test] - fn invalid_arrays() { - let invalid_inputs = [r#"["#, r#"[,]"#, r#"[,2]"#, r#"[1e165,,]"#]; - for input in invalid_inputs { - dbg!(input); - let mut parsed = array.parse(new_input(input)); - if let Ok(parsed) = &mut parsed { - parsed.despan(input); - } - assert!(parsed.is_err()); - } + fn sep_value(&mut self, event: &toml_parse::parser::Event) { + self.trailing_start = Some(event.span().end()); + } + + fn close( + &mut self, + open_event: &toml_parse::parser::Event, + close_event: &toml_parse::parser::Event, + result: &mut Array, + ) { + #[cfg(feature = "unstable-debug")] + let _scope = TraceScope::new("array::close"); + let trailing_comma = self.trailing_start.is_some() && !result.is_empty(); + let span = open_event.span().append(close_event.span()); + let trailing_start = self + .trailing_start + .unwrap_or_else(|| close_event.span().start()); + let trailing_end = close_event.span().start(); + + result.set_trailing_comma(trailing_comma); + result.set_trailing(RawString::with_span(trailing_start..trailing_end)); + result.span = Some(span.start()..span.end()); } } diff --git a/crates/toml_edit/src/parser/datetime.rs b/crates/toml_edit/src/parser/datetime.rs deleted file mode 100644 index afff2c7be..000000000 --- a/crates/toml_edit/src/parser/datetime.rs +++ /dev/null @@ -1,469 +0,0 @@ -use std::ops::RangeInclusive; - -use crate::parser::error::CustomError; -use crate::parser::prelude::*; -use crate::parser::trivia::from_utf8_unchecked; - -use toml_datetime::{Date, Datetime, Offset, Time}; -use winnow::combinator::alt; -use winnow::combinator::cut_err; -use winnow::combinator::opt; -use winnow::combinator::preceded; -use winnow::combinator::trace; -use winnow::stream::Stream as _; -use winnow::token::one_of; -use winnow::token::take_while; - -// ;; Date and Time (as defined in RFC 3339) - -// date-time = offset-date-time / local-date-time / local-date / local-time -// offset-date-time = full-date time-delim full-time -// local-date-time = full-date time-delim partial-time -// local-date = full-date -// local-time = partial-time -// full-time = partial-time time-offset -pub(crate) fn date_time(input: &mut Input<'_>) -> ModalResult { - trace( - "date-time", - alt(( - (full_date, opt((time_delim, partial_time, opt(time_offset)))) - .map(|(date, opt)| { - match opt { - // Offset Date-Time - Some((_, time, offset)) => Datetime { - date: Some(date), - time: Some(time), - offset, - }, - // Local Date - None => Datetime { - date: Some(date), - time: None, - offset: None, - }, - } - }) - .context(StrContext::Label("date-time")), - partial_time - .map(|t| t.into()) - .context(StrContext::Label("time")), - )), - ) - .parse_next(input) -} - -// full-date = date-fullyear "-" date-month "-" date-mday -fn full_date(input: &mut Input<'_>) -> ModalResult { - trace("full-date", full_date_).parse_next(input) -} - -fn full_date_(input: &mut Input<'_>) -> ModalResult { - let year = date_fullyear.parse_next(input)?; - let _ = b'-'.parse_next(input)?; - let month = cut_err(date_month).parse_next(input)?; - let _ = cut_err(b'-').parse_next(input)?; - let day_start = input.checkpoint(); - let day = cut_err(date_mday).parse_next(input)?; - - let is_leap_year = (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)); - let max_days_in_month = match month { - 2 if is_leap_year => 29, - 2 => 28, - 4 | 6 | 9 | 11 => 30, - _ => 31, - }; - if max_days_in_month < day { - input.reset(&day_start); - return Err( - winnow::error::ErrMode::from_external_error(input, CustomError::OutOfRange).cut(), - ); - } - - Ok(Date { year, month, day }) -} - -// partial-time = time-hour ":" time-minute ":" time-second [time-secfrac] -fn partial_time(input: &mut Input<'_>) -> ModalResult