Skip to content

feat(toml): TOML 1.1 parse support #16415

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
weihanglo merged 1 commit into from
Dec 29, 2025
Merged

feat(toml): TOML 1.1 parse support #16415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ tar = { version = "0.4.44", default-features = false }
tempfile = "3.23.0"
thiserror = "2.0.17"
time = { version = "0.3.44", features = ["parsing", "formatting", "serde"] }
toml = { version = "0.9.8", default-features = false }
toml_edit = { version = "0.23.7", features = ["serde"] }
toml = { version = "0.9.10", default-features = false }
toml_edit = { version = "0.24.0", features = ["serde"] }
tracing = { version = "0.1.43", default-features = false, features = ["std"] } # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9
tracing-chrome = "0.7.2"
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
Expand Down
10 changes: 4 additions & 6 deletions tests/testsuite/bad_config.rs
View file
Open in desktop

@weihanglo weihanglo Dec 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the upgrade. I am really excited about it!

Anyone using these features will raise their development MSRV.

Do we care about helping people catch this? Like we discussed earlier on Zulip, one (and probably the only) case that may affect people is via git dependencies.

@epage epage Dec 18, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If people have an MSRV, they should generally have CI jobs to verify it or else it is likely a lie. We call out verification as an expectation.

To verify this, we'd have to write a custom tool that re-parses the file and try to walk the structure for inline tables and check for these. It won't be cheap.

@weihanglo weihanglo Dec 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify this, we'd have to write a custom tool that re-parses the file and try to walk the structure for inline tables and check for these. It won't be cheap.

A way to do it is that we depend on an old version of toml_edit for 1.0 spec, and parse again to see if it fails.

If people have an MSRV, they should generally have CI jobs to verify it or else it is likely a lie. We call out verification as an expectation.

I agree, though not everything is in a ideal state having a proper CI setup. If not code change, I guess it is worth putting a caution in CHANGELOG for this MSRV breakage.

Comment thread
weihanglo marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -544,13 +544,11 @@ fn malformed_override() {
p.cargo("check")
.with_status(101)
.with_stderr_data(str![[r#"
[ERROR] newlines are unsupported in inline tables, expected nothing
--> Cargo.toml:9:27
[ERROR] missing assignment between key-value pairs, expected `=`
--> Cargo.toml:10:24
|
9 | native = {
| ___________________________^
10 | | foo: "bar"
| |_^
10 | foo: "bar"
| ^

"#]])
.run();
Expand Down