Skip to content

Commit 54281b8

Browse files
committed
Auto merge of #13376 - epage:error, r=Muscraft
fix(toml): Improve map/sequence error message This is a follow up to #13375
2 parents 0f37cfb + bd6b4a9 commit 54281b8

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ tar = { version = "0.4.40", default-features = false }
9696
tempfile = "3.9.0"
9797
thiserror = "1.0.56"
9898
time = { version = "0.3", features = ["parsing", "formatting", "serde"] }
99-
toml = "0.8.8"
100-
toml_edit = { version = "0.21.0", features = ["serde"] }
99+
toml = "0.8.9"
100+
toml_edit = { version = "0.21.1", features = ["serde"] }
101101
tracing = "0.1.37" # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9
102102
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
103103
unicase = "2.7.0"

tests/testsuite/diagnostics.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ edition = "2021"
2121
.with_stderr(
2222
"\
2323
error: invalid type: map, expected a sequence
24-
--> Cargo.toml:1:1
25-
|
26-
|
24+
--> Cargo.toml:6:3
25+
|
26+
6 | [[bench.foo]]
27+
| ^^^^^
28+
|
2729
",
2830
)
2931
.run();

0 commit comments

Comments
 (0)