Skip to content

fix(toml): Clarify the edition is on the float#16676

Merged
Muscraft merged 4 commits intorust-lang:masterfrom
epage:script
Feb 26, 2026
Merged

fix(toml): Clarify the edition is on the float#16676
Muscraft merged 4 commits intorust-lang:masterfrom
epage:script

Conversation

@epage
Copy link
Copy Markdown
Contributor

@epage epage commented Feb 25, 2026

What does this PR try to resolve?

I decided to keep it light for now as there are frustrations with this
warning but we may want to weigh that with providing a suggestion for
the edit, a help to use cargo fix (once implemented), etc.

Along the way, I made the two edition warnings use a more consistent wording. I ended up preferring the script variant over Cargo.toml because it
gives a more concrete answer as to what we are looking for by naming the
field.

How to test and review this PR?

I ended up preferring the script variant over `Cargo.toml` because it
gives a more concrete answer as to what we are looking for by naming the
field.
I decided to keep it light for now as there are frustrations with this
warning but we may want to weigh that with providing a suggestion for
the edit, a help to use `cargo fix` (once implemented), etc.
@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 25, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Feb 25, 2026

r? @weihanglo

rustbot has assigned @weihanglo.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ehuss, @epage, @weihanglo
  • @ehuss, @epage, @weihanglo expanded to ehuss, epage, weihanglo
  • Random selection from ehuss, weihanglo

@Muscraft Muscraft enabled auto-merge February 26, 2026 21:58
@Muscraft Muscraft added this pull request to the merge queue Feb 26, 2026
Merged via the queue into rust-lang:master with commit 1ac10a3 Feb 26, 2026
29 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2026
@epage epage deleted the script branch February 26, 2026 23:11
github-merge-queue Bot pushed a commit that referenced this pull request Feb 27, 2026
### What does this PR try to resolve?

### How to test and review this PR?

This is stacked on top of #16676.

I was originally not worrying about `cargo fix` being able to inject the
edition because I figured we'd wait for proper `cargo fix` for
`Cargo.toml` files. However, that would be designed for lints and this
wouldn't be a lint but a hard warning, so that may no work out, so I
went and hard coded this in `cargo fix.
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Mar 5, 2026
Update cargo submodule

11 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..708100e0d0fe64ad66e05dc5a19110936a5ca4b1
2026-02-24 21:59:20 +0000 to 2026-03-05 02:03:19 +0000
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Mar 5, 2026
Update cargo submodule

12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Mar 5, 2026
Update cargo submodule

12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Mar 6, 2026
Update cargo submodule



12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
@rustbot rustbot added this to the 1.96.0 milestone Mar 6, 2026
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Mar 8, 2026
Update cargo submodule



12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
github-actions Bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Mar 9, 2026
Update cargo submodule



12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Mar 9, 2026
Update cargo submodule



12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-manifest Area: Cargo.toml issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants