Clean up `compiler/rustc*/Cargo.toml` #117068

nnethercote · 2023-10-23T04:55:02Z

Mostly by sorting dependencies, plus some other minor things.

rustbot · 2023-10-23T04:55:13Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

nnethercote · 2023-10-23T05:37:49Z

Best reviewed one commit at a time.

klensy · 2023-10-23T10:15:24Z

rust-lang/rustfmt#4091

nnethercote · 2023-10-23T10:32:30Z

rust-lang/rustfmt#4091

I did a trial run of this PR's approach in #116477 where I said the following:

There are ongoing efforts to provide linting/formatting of Cargo.toml files, e.g. rust-lang/rustfmt#5240, https://crates.io/crates/cargo-toml-lint, and https://github.com/TimonPost/cargo-toml-format. But it's far from clear what's the right approach.

So this PR does something very simple: it uses the order checking already present in tidy. This allows incremental application of ordering, starting right now, and avoiding the need for any kind of all-at-once conversion.

If we do end up using some more comprehensive Cargo.toml linting/formatting solution in the future, the tidy-alphabetical lines will be easy to remove.

I think that still applies.

src/tools/tidy/src/alphabetical.rs

nnethercote · 2023-10-24T02:00:30Z

##[error]tidy error: /checkout/compiler/rustc_mir_transform/Cargo.toml:11: line not in alphabetical order

I don't understand this error. The line in question looks fine. Also, there was no failure on the initial push, and that file didn't change on the subsequent push.

src/tools/tidy/src/alphabetical.rs

cuviper · 2023-10-25T04:02:39Z

It's complaining about the rustc_arena occurring after the rustc_ast line, which would be fine except that compiler/rustc_mir_transform/Cargo.toml doesn't contain a rustc_arena line! Not in the current repository, and not in the code that forms this PR.

#107009 merged with that yesterday:

rust/compiler/rustc_mir_transform/Cargo.toml

Line 14 in 2e4e2a8

rustc_arena = { path = "../rustc_arena" }

bors · 2023-10-28T00:00:44Z

☔ The latest upstream changes (presumably #117294) made this pull request unmergeable. Please resolve the merge conflicts.

…ests, r=Nilstrieb tidy: add unit tests for alphabetical checks I discovered there aren't any tests while working on rust-lang#117068. r? `@Nilstrieb`

The comment explains it's for `unstable_offset_of`, but `offset_of` is now stable.

- Sort dependencies and features sections. - Add `tidy` markers to the sorted sections so they stay sorted. - Remove empty `[lib`] sections. - Remove "See more keys..." comments. Excluded files: - rustc_codegen_{cranelift,gcc}, because they're external. - rustc_lexer, because it has external use. - stable_mir, because it has external use.

nnethercote · 2023-10-29T21:53:05Z

I fixed the conflicts.

wesleywiser · 2023-10-30T14:08:27Z

@bors r+

bors · 2023-10-30T14:08:30Z

📌 Commit 8ff624a has been approved by wesleywiser

It is now in the queue for this repository.

…=wesleywiser Clean up `compiler/rustc*/Cargo.toml` Mostly by sorting dependencies, plus some other minor things. r? `@wesleywiser`

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#112463 (rustdoc: elide cross-crate default generic arguments) - rust-lang#117068 (Clean up `compiler/rustc*/Cargo.toml`) - rust-lang#117132 (On object safety error, mention new enum as alternative) - rust-lang#117317 (share some track_caller logic between interpret and codegen) - rust-lang#117356 (Add support for mipsel-unknown-netbsd, 32-bit LE mips.) - rust-lang#117357 (Rename a few remaining references to abort terminator) - rust-lang#117370 (C-variadic error improvements) - rust-lang#117376 (More `rustc_interface` cleanups) - rust-lang#117383 (improve and fix `x install`) - rust-lang#117390 (Fix unused variables lint issue for args in macro) - rust-lang#117395 (Fix missing leading space in suggestion) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117068 - nnethercote:clean-up-Cargo-toml, r=wesleywiser Clean up `compiler/rustc*/Cargo.toml` Mostly by sorting dependencies, plus some other minor things. r? ``@wesleywiser``

rustbot assigned wesleywiser Oct 23, 2023

cjgillot reviewed Oct 23, 2023

View reviewed changes

src/tools/tidy/src/alphabetical.rs Outdated Show resolved Hide resolved

nnethercote force-pushed the clean-up-Cargo-toml branch from eaff0a3 to b0b7c5a Compare October 23, 2023 21:49

This comment has been minimized.

Sign in to view

klensy reviewed Oct 24, 2023

View reviewed changes

src/tools/tidy/src/alphabetical.rs Outdated Show resolved Hide resolved

nnethercote force-pushed the clean-up-Cargo-toml branch from b0b7c5a to ad56628 Compare October 24, 2023 20:56

This comment has been minimized.

Sign in to view

nnethercote mentioned this pull request Oct 25, 2023

tidy: add unit tests for alphabetical checks #117149

Merged

This comment has been minimized.

Sign in to view

nnethercote force-pushed the clean-up-Cargo-toml branch from a03aadc to fc56c0c Compare October 25, 2023 02:21

This comment has been minimized.

Sign in to view

nnethercote force-pushed the clean-up-Cargo-toml branch from fc56c0c to 0d14659 Compare October 25, 2023 05:04

nnethercote added 2 commits October 30, 2023 08:25

Remove memoffset dependency from rustc_query_impl.

28e60de

The comment explains it's for `unstable_offset_of`, but `offset_of` is now stable.

nnethercote force-pushed the clean-up-Cargo-toml branch from 0d14659 to 8ff624a Compare October 29, 2023 21:52

wesleywiser approved these changes Oct 30, 2023

View reviewed changes

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 Oct 30, 2023

This was referenced Oct 30, 2023

Rollup of 12 pull requests #117404

Closed

Rollup of 11 pull requests #117405

Merged

bors merged commit 824e367 into rust-lang:master Oct 30, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 30, 2023

nnethercote deleted the clean-up-Cargo-toml branch October 30, 2023 21:04

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up `compiler/rustc*/Cargo.toml` #117068

Clean up `compiler/rustc*/Cargo.toml` #117068

nnethercote commented Oct 23, 2023

rustbot commented Oct 23, 2023

nnethercote commented Oct 23, 2023

klensy commented Oct 23, 2023

nnethercote commented Oct 23, 2023

This comment has been minimized.

nnethercote commented Oct 24, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

cuviper commented Oct 25, 2023

bors commented Oct 28, 2023

nnethercote commented Oct 29, 2023

wesleywiser commented Oct 30, 2023

bors commented Oct 30, 2023

Clean up compiler/rustc*/Cargo.toml #117068

Clean up compiler/rustc*/Cargo.toml #117068

Conversation

nnethercote commented Oct 23, 2023

rustbot commented Oct 23, 2023

nnethercote commented Oct 23, 2023

klensy commented Oct 23, 2023

nnethercote commented Oct 23, 2023

This comment has been minimized.

nnethercote commented Oct 24, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

cuviper commented Oct 25, 2023

bors commented Oct 28, 2023

nnethercote commented Oct 29, 2023

wesleywiser commented Oct 30, 2023

bors commented Oct 30, 2023

Clean up `compiler/rustc*/Cargo.toml` #117068

Clean up `compiler/rustc*/Cargo.toml` #117068