feat(toml): TOML 1.1 parse support #16415

epage · 2025-12-18T13:42:30Z

What does this PR try to resolve?

Support

multi-line inline tables
trailing commas on inline tables
\e string escape character
\xHH string escape character
Optional seconds in times (sets to 0)

Anyone using these features will raise their development MSRV. The published Cargo.toml file will still be compatible with old TOML parsers and so old Cargos. If toml_datetime gains the ability to track whether seconds were optional (will be a breaking change), then that might change though that would only apply to package.metadata as we don't make use of times in Cargo.

How to test and review this PR?

rustbot · 2025-12-18T13:42:34Z

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

weihanglo · 2025-12-18T14:28:30Z

tests/testsuite/bad_config.rs

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.

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.

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.

tests/testsuite/bad_config.rs

weihanglo

Thanks!

View changes since this review

weihanglo · 2025-12-18T16:24:11Z

@rfcbot fcp merge T-cargo

This a one-way door change — Once Cargo starts supporting 1.1 we cannot revert back. Worth a check with the entire team.

rust-rfcbot · 2025-12-18T16:25:45Z

Team member @weihanglo has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

0xPoe

A dumb question: Does it make sense to add some tests to cover the newly supported formats and parsing behavior in Cargo? or is this outside the scope of Cargo tests? (The toml itself would have sufficient tests, and there is nothing special here.)

View changes since this review

epage · 2025-12-18T20:44:17Z

I think it's fine to delegate that to toml which includes running the TOML conformance tests.

0xPoe

Thanks!

View changes since this review

rust-rfcbot · 2025-12-18T22:41:22Z

🔔 This is now entering its final comment period, as per the review above. 🔔

rustbot · 2025-12-26T18:58:51Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

rust-rfcbot · 2025-12-28T22:45:57Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

weihanglo · 2025-12-28T23:36:06Z

Going to merge this.

I want to note again:

Using TOML v1.1 features doesn't affect the MSRV for crates published to crates.io, since Cargo always rewrites the Cargo.toml in a .crate to TOML v0.5 or lower.
However, using those will bump your package's MSRV for development. We recommend people setting CI to verify package.rust-version.

Update cargo submodule 9 commits in 94c368ad2b9db0f0da5bdd8421cea13786ce4412..b54051b1505281ec7a45a250140a0ff25d33f319 2025-12-26 19:39:15 +0000 to 2025-12-30 20:35:52 +0000 - fix(log): add `dependencies` field to `UnitRegistered` (rust-lang/cargo#16448) - Implement fine grain locking for `build-dir` (rust-lang/cargo#16155) - feat(resolver): List features when no close match (rust-lang/cargo#16445) - feat(report): new command `cargo report sessions` (rust-lang/cargo#16428) - feat (patch): Display where the patch was defined in patch-related error messages (rust-lang/cargo#16407) - test(build-rs): Reduce from 'build' to 'check' where possible (rust-lang/cargo#16444) - feat(toml): TOML 1.1 parse support (rust-lang/cargo#16415) - feat(report): support --manifest-path in `cargo report timings` (rust-lang/cargo#16441) - fix(vendor): recursively filter git files in subdirectories (rust-lang/cargo#16439) r? ghost

Update cargo submodule 19 commits in 94c368ad2b9db0f0da5bdd8421cea13786ce4412..623444427f04292f3a3c7eac560cfa65ba0bb88e 2025-12-26 19:39:15 +0000 to 2026-01-06 21:05:05 +0000 - docs(unstable): expand docs for `-Zbuild-analysis` (rust-lang/cargo#16476) - test: add `-Zunstable-options` with custom targets (rust-lang/cargo#16467) - feat(report): add cargo report rebuilds (rust-lang/cargo#16456) - feat(test-support): Use test name for dir when running tests (rust-lang/cargo#16121) - refactor: Migrate some cases to expect/reason (rust-lang/cargo#16461) - docs(build-script): clarify OUT_DIR is not cleaned between builds (rust-lang/cargo#16437) - chore: Update dependencies (rust-lang/cargo#16460) - Update handlebars to 6.4.0 (rust-lang/cargo#16457) - chore(deps): update alpine docker tag to v3.23 (rust-lang/cargo#16454) - Any build scripts can now use cargo::metadata=KEY=VALUE (rust-lang/cargo#16436) - fix(log): add `dependencies` field to `UnitRegistered` (rust-lang/cargo#16448) - Implement fine grain locking for `build-dir` (rust-lang/cargo#16155) - feat(resolver): List features when no close match (rust-lang/cargo#16445) - feat(report): new command `cargo report sessions` (rust-lang/cargo#16428) - feat (patch): Display where the patch was defined in patch-related error messages (rust-lang/cargo#16407) - test(build-rs): Reduce from 'build' to 'check' where possible (rust-lang/cargo#16444) - feat(toml): TOML 1.1 parse support (rust-lang/cargo#16415) - feat(report): support --manifest-path in `cargo report timings` (rust-lang/cargo#16441) - fix(vendor): recursively filter git files in subdirectories (rust-lang/cargo#16439) r? ghost

Update cargo submodule 24 commits in 94c368ad2b9db0f0da5bdd8421cea13786ce4412..fc4c92b64d1e0046b66cbdc747cc1c17af8b35a0 2025-12-26 19:39:15 +0000 to 2026-01-08 06:54:56 +0000 - Fixed incorrect version comparision during build script dependency selection (rust-lang/cargo#16486) - refactor: new type for unit index (rust-lang/cargo#16485) - feat(test): Make CARGO_BIN_EXE_ available at runtime (rust-lang/cargo#16421) - fix(package): detect dirty files when run from workspace member (rust-lang/cargo#16479) - fix(timing)!: remove `--timings=<FMT>` optional format values (rust-lang/cargo#16420) - docs(unstable): expand docs for `-Zbuild-analysis` (rust-lang/cargo#16476) - test: add `-Zunstable-options` with custom targets (rust-lang/cargo#16467) - feat(report): add cargo report rebuilds (rust-lang/cargo#16456) - feat(test-support): Use test name for dir when running tests (rust-lang/cargo#16121) - refactor: Migrate some cases to expect/reason (rust-lang/cargo#16461) - docs(build-script): clarify OUT_DIR is not cleaned between builds (rust-lang/cargo#16437) - chore: Update dependencies (rust-lang/cargo#16460) - Update handlebars to 6.4.0 (rust-lang/cargo#16457) - chore(deps): update alpine docker tag to v3.23 (rust-lang/cargo#16454) - Any build scripts can now use cargo::metadata=KEY=VALUE (rust-lang/cargo#16436) - fix(log): add `dependencies` field to `UnitRegistered` (rust-lang/cargo#16448) - Implement fine grain locking for `build-dir` (rust-lang/cargo#16155) - feat(resolver): List features when no close match (rust-lang/cargo#16445) - feat(report): new command `cargo report sessions` (rust-lang/cargo#16428) - feat (patch): Display where the patch was defined in patch-related error messages (rust-lang/cargo#16407) - test(build-rs): Reduce from 'build' to 'check' where possible (rust-lang/cargo#16444) - feat(toml): TOML 1.1 parse support (rust-lang/cargo#16415) - feat(report): support --manifest-path in `cargo report timings` (rust-lang/cargo#16441) - fix(vendor): recursively filter git files in subdirectories (rust-lang/cargo#16439)

Update cargo submodule 27 commits in 94c368ad2b9db0f0da5bdd8421cea13786ce4412..8c133afcd5e0d69932fe11f5907683723f8d361d 2025-12-26 19:39:15 +0000 to 2026-01-09 03:50:15 +0000 - Isolate build script metadata progation between std and non-std crates (rust-lang/cargo#16489) - Add Clippy like lint groups (rust-lang/cargo#16464) - feat: in-memory only `Manifest` (rust-lang/cargo#16409) - Fixed incorrect version comparision during build script dependency selection (rust-lang/cargo#16486) - refactor: new type for unit index (rust-lang/cargo#16485) - feat(test): Make CARGO_BIN_EXE_ available at runtime (rust-lang/cargo#16421) - fix(package): detect dirty files when run from workspace member (rust-lang/cargo#16479) - fix(timing)!: remove `--timings=<FMT>` optional format values (rust-lang/cargo#16420) - docs(unstable): expand docs for `-Zbuild-analysis` (rust-lang/cargo#16476) - test: add `-Zunstable-options` with custom targets (rust-lang/cargo#16467) - feat(report): add cargo report rebuilds (rust-lang/cargo#16456) - feat(test-support): Use test name for dir when running tests (rust-lang/cargo#16121) - refactor: Migrate some cases to expect/reason (rust-lang/cargo#16461) - docs(build-script): clarify OUT_DIR is not cleaned between builds (rust-lang/cargo#16437) - chore: Update dependencies (rust-lang/cargo#16460) - Update handlebars to 6.4.0 (rust-lang/cargo#16457) - chore(deps): update alpine docker tag to v3.23 (rust-lang/cargo#16454) - Any build scripts can now use cargo::metadata=KEY=VALUE (rust-lang/cargo#16436) - fix(log): add `dependencies` field to `UnitRegistered` (rust-lang/cargo#16448) - Implement fine grain locking for `build-dir` (rust-lang/cargo#16155) - feat(resolver): List features when no close match (rust-lang/cargo#16445) - feat(report): new command `cargo report sessions` (rust-lang/cargo#16428) - feat (patch): Display where the patch was defined in patch-related error messages (rust-lang/cargo#16407) - test(build-rs): Reduce from 'build' to 'check' where possible (rust-lang/cargo#16444) - feat(toml): TOML 1.1 parse support (rust-lang/cargo#16415) - feat(report): support --manifest-path in `cargo report timings` (rust-lang/cargo#16441) - fix(vendor): recursively filter git files in subdirectories (rust-lang/cargo#16439)

feat(toml): TOML 1.1 parse support

e9daaff

rustbot assigned ehuss Dec 18, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 18, 2025

weihanglo reviewed Dec 18, 2025

View reviewed changes

tests/testsuite/bad_config.rs Show resolved Hide resolved

weihanglo approved these changes Dec 18, 2025

View reviewed changes

weihanglo added this pull request to the merge queue Dec 18, 2025

weihanglo removed this pull request from the merge queue due to a manual request Dec 18, 2025

weihanglo added the T-cargo Team: Cargo label Dec 18, 2025

This comment was marked as duplicate.

Sign in to view

rust-rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge labels Dec 18, 2025

0xPoe reviewed Dec 18, 2025

View reviewed changes

0xPoe approved these changes Dec 18, 2025

View reviewed changes

rust-rfcbot added final-comment-period FCP — a period for last comments before action is taken and removed proposed-final-comment-period An FCP proposal has started, but not yet signed off. labels Dec 18, 2025

epage force-pushed the toml branch from ae81e65 to d13d7cc Compare December 19, 2025 22:31

This comment has been minimized.

Sign in to view

epage force-pushed the toml branch from d13d7cc to e9daaff Compare December 26, 2025 18:58

rust-rfcbot added finished-final-comment-period FCP complete to-announce and removed final-comment-period FCP — a period for last comments before action is taken labels Dec 28, 2025

weihanglo added this pull request to the merge queue Dec 28, 2025

Merged via the queue into rust-lang:master with commit b6306ca Dec 29, 2025
31 checks passed

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 29, 2025

iepathos mentioned this pull request Dec 29, 2025

feat(formatting): Add max_width with array reflow crate-ci/cargo-cargofmt#37

Open

epage deleted the toml branch December 29, 2025 13:56

epage mentioned this pull request Dec 29, 2025

Wrong error message when double quote in a patch. #16443

Closed

This was referenced Dec 30, 2025

support TOML v1.1.0 in Cargo.toml #16447

Closed

Update cargo submodule rust-lang/rust#150525

Merged

rustbot added this to the 1.94.0 milestone Dec 31, 2025

weihanglo mentioned this pull request Jan 6, 2026

Update cargo submodule rust-lang/rust#150739

Merged

feat(toml): TOML 1.1 parse support #16415

feat(toml): TOML 1.1 parse support #16415

Conversation

epage commented Dec 18, 2025

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

rustbot commented Dec 18, 2025

Uh oh!

weihanglo Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

epage Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

weihanglo left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

weihanglo commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as duplicate.

rust-rfcbot commented Dec 18, 2025 • edited by joshtriplett Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xPoe left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

epage commented Dec 18, 2025

Uh oh!

0xPoe left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-rfcbot commented Dec 18, 2025

Uh oh!

This comment has been minimized.

rustbot commented Dec 26, 2025

Uh oh!

rust-rfcbot commented Dec 28, 2025

Uh oh!

weihanglo commented Dec 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

weihanglo left a comment •

edited by rustbot

Loading

weihanglo commented Dec 18, 2025 •

edited

Loading

rust-rfcbot commented Dec 18, 2025 •

edited by joshtriplett

Loading

0xPoe left a comment •

edited

Loading

0xPoe left a comment •

edited by rustbot

Loading

weihanglo commented Dec 28, 2025 •

edited

Loading