Skip to content
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.

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

test: Make edition explicit in packages #13504

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Conversation

epage
Copy link
Contributor

@epage epage commented Feb 29, 2024

What does this PR try to resolve?

This ensures we don't rely on the edition default for manifests, unblocking the door for warning on unset editions.

How should we test and review this PR?

Additional information

Alternatives considered

  • Augment test output for the new warnings: figured we'd want tests closer to our intention and this seemed more work to update everything
  • Make a builder API for generating manifests, allowing us to change the default in one place. Still an interesting idea but a lot of work for this one change.

Risks

  • I missed that a test was specifically for unset edition but that is unlikely of a case to come up

@rustbot
Copy link
Collaborator

rustbot commented Feb 29, 2024

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

@rustbot rustbot added A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 29, 2024
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thought you implemented inline snapshot in snapbox for this PR, but it turns out that you're the inline snapshotter!

I can imagine when Edition 2024 becomes the default, we'll need to update all cargo new/init snapshots again.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 29, 2024

📌 Commit 14646e6 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 29, 2024
@bors
Copy link
Contributor

bors commented Feb 29, 2024

⌛ Testing commit 14646e6 with merge ecb8193...

@bors
Copy link
Contributor

bors commented Feb 29, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing ecb8193 to master...

@bors bors merged commit ecb8193 into rust-lang:master Feb 29, 2024
23 checks passed
@epage epage deleted the edition-test branch February 29, 2024 20:39
bors added a commit that referenced this pull request Mar 1, 2024
feat(toml): Warn on unset Edition

### What does this PR try to resolve?

On [Internals](https://internals.rust-lang.org/t/idea-rustc-cargo-should-warn-on-unspecified-edition/20309), the idea came up for warning on unset Edition.

Besides helping people who forget to set the Edition, this creates symmetry between `Cargo.toml` and cargo scripts (#12207).  While the default is different in each case, we are making the default obvious and guiding people away from it.

### How should we test and review this PR?

There are separate commits for adding tests (and refactors) so the changes in behavior will be more obvious

### Additional information

This builds on
- #13499
- #13504
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 2, 2024
Update cargo

12 commits in 8964c8ccff6e420e2a38b8696d178d69fab84d9d..f772ec0224d3755ce52ac5128a80319fb2eb45d0
2024-02-27 19:22:46 +0000 to 2024-03-01 22:57:35 +0000
- feat(toml): Warn on unset Edition (rust-lang/cargo#13505)
- fix(msrv): Report all incompatible packages, not just a random one (rust-lang/cargo#13514)
- refactor: abstract `std::fs` away from on-disk index cache (rust-lang/cargo#13515)
- chore(deps): update compatible (rust-lang/cargo#13507)
- chore(deps): update rust crate rusqlite to 0.31.0 (rust-lang/cargo#13510)
- [docs]: Clarify vendored sources as read-only and way to modify (rust-lang/cargo#13512)
- chore(deps): update rust crate supports-hyperlinks to v3 (rust-lang/cargo#13511)
- refactor: Clarify more Config -> Context (rust-lang/cargo#13506)
- test: Make `edition` explicit in packages (rust-lang/cargo#13504)
- Add all unit's children recursively for `doc.extern-map` option (rust-lang/cargo#13481)
- fix(rustc): Always pass --edition to rustc (rust-lang/cargo#13499)
- Silently ignore `cargo::rustc-check-cfg` to avoid MSRV annoyance when stabilizing `-Zcheck-cfg` (rust-lang/cargo#13438)

r? ghost
@rustbot rustbot added this to the 1.78.0 milestone Mar 2, 2024
dieterplex added a commit to dieterplex/cargo that referenced this pull request Jul 5, 2024
This is a follow up to 14646e6 and it would fix warnings while migrating
jobserver tests to snapbox.

see [feat(toml): Warn on unset Edition rust-lang#13505](rust-lang#13504)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testing-cargo-itself Area: cargo's tests S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants