Use tidy to sort `sym::*` items #143110

yotamofek · 2025-06-27T18:04:41Z

Use tidy to sort the symbols in the invocation of symbols!, instead of implementing the ordering check inside the proc macro.

(asked @nnethercote about this on zulip, he didn't have any reservations about making this change)

This has a couple of benefits:

tidy's "version sort" (thanks to make tidy-alphabetical use a natural sort #141311 !) is nicer than the naive-cmp sort, so, e.g. AtomicI{8, 16, 32, 64, 128} are properly sorted by bit width.
consistency with the rest of the repo
allows us to remove a bit of order-verifying code from the symbols! proc macro impl

rustbot · 2025-06-27T18:04:45Z

r? @BoxyUwU

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

scottmcm · 2025-06-27T22:14:33Z

Looks good to me! Treating it as a formatting problem instead of a macro error sounds generally good anyway, and I agree the version-sort order is nicer in the places that changed.

@bors r+

bors · 2025-06-27T22:14:35Z

📌 Commit 7a3a7c0 has been approved by scottmcm

It is now in the queue for this repository.

nnethercote · 2025-06-28T05:35:29Z

This is good, but I have a couple of nits I'd like addressed, so for now:

@bors r-

nnethercote · 2025-06-28T05:37:22Z

compiler/rustc_span/src/symbol.rs

@@ -158,6 +158,7 @@ symbols! {
    // There is currently no checking that all symbols are used; that would be


The above paragraph is now out-of-date:

The proc macro will only abort if symbols are duplicated (I assume the duplication detection still works?)

The Vim instructions are no longer correct and should just be removed.

Once that's addressed it will be good to go.

Thanks, missed that! Removed the whole paragraph.

I assume the duplication detection still works?

Yep.

Did something go wrong? It looks like the paragraph is still there.

Oh woops 🫢
Sorry about that.
I think I haven't completely woken up yet today 😅

nnethercote · 2025-06-28T09:31:40Z

@bors r+ rollup

bors · 2025-06-28T09:31:42Z

📌 Commit 00b64f8 has been approved by nnethercote

It is now in the queue for this repository.

…, r=nnethercote Use tidy to sort `sym::*` items Use tidy to sort the symbols in the invocation of `symbols!`, instead of implementing the ordering check inside the proc macro. (asked `@nnethercote` about this on zulip, he didn't have any reservations about making this change) This has a couple of benefits: - tidy's "version sort" (thanks to rust-lang#141311 !) is nicer than the naive-cmp sort, so, e.g. `AtomicI{8, 16, 32, 64, 128}` are properly sorted by bit width. - consistency with the rest of the repo - allows us to remove a bit of order-verifying code from the `symbols!` proc macro impl

…, r=nnethercote Use tidy to sort `sym::*` items Use tidy to sort the symbols in the invocation of `symbols!`, instead of implementing the ordering check inside the proc macro. (asked ``@nnethercote`` about this on zulip, he didn't have any reservations about making this change) This has a couple of benefits: - tidy's "version sort" (thanks to rust-lang#141311 !) is nicer than the naive-cmp sort, so, e.g. `AtomicI{8, 16, 32, 64, 128}` are properly sorted by bit width. - consistency with the rest of the repo - allows us to remove a bit of order-verifying code from the `symbols!` proc macro impl

…, r=nnethercote Use tidy to sort `sym::*` items Use tidy to sort the symbols in the invocation of `symbols!`, instead of implementing the ordering check inside the proc macro. (asked ```@nnethercote``` about this on zulip, he didn't have any reservations about making this change) This has a couple of benefits: - tidy's "version sort" (thanks to rust-lang#141311 !) is nicer than the naive-cmp sort, so, e.g. `AtomicI{8, 16, 32, 64, 128}` are properly sorted by bit width. - consistency with the rest of the repo - allows us to remove a bit of order-verifying code from the `symbols!` proc macro impl

Rollup of 10 pull requests Successful merges: - #123476 (std::net: adding `unix_socket_exclbind` feature for solaris/illumos.) - #142708 (Do not include NUL-terminator in computed length) - #142963 (Skip unnecessary components in x64 try builds) - #142987 (rustdoc: show attributes on enum variants) - #143031 (Add windows-gnullvm hosts to the manifest) - #143082 (update internal `send_signal` comment) - #143110 (Use tidy to sort `sym::*` items) - #143111 (BTreeSet: remove duplicated code by reusing `from_sorted_iter`) - #143114 (Minor Documentation Improvements) - #143137 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…, r=nnethercote Use tidy to sort `sym::*` items Use tidy to sort the symbols in the invocation of `symbols!`, instead of implementing the ordering check inside the proc macro. (asked ````@nnethercote```` about this on zulip, he didn't have any reservations about making this change) This has a couple of benefits: - tidy's "version sort" (thanks to rust-lang#141311 !) is nicer than the naive-cmp sort, so, e.g. `AtomicI{8, 16, 32, 64, 128}` are properly sorted by bit width. - consistency with the rest of the repo - allows us to remove a bit of order-verifying code from the `symbols!` proc macro impl

Rollup of 10 pull requests Successful merges: - #123476 (std::net: adding `unix_socket_exclbind` feature for solaris/illumos.) - #142708 (Do not include NUL-terminator in computed length) - #142963 (Skip unnecessary components in x64 try builds) - #142974 (Update stage0 to 1.89.0-beta.1) - #142987 (rustdoc: show attributes on enum variants) - #143031 (Add windows-gnullvm hosts to the manifest) - #143082 (update internal `send_signal` comment) - #143110 (Use tidy to sort `sym::*` items) - #143111 (BTreeSet: remove duplicated code by reusing `from_sorted_iter`) - #143114 (Minor Documentation Improvements) r? `@ghost` `@rustbot` modify labels: rollup

…, r=nnethercote Use tidy to sort `sym::*` items Use tidy to sort the symbols in the invocation of `symbols!`, instead of implementing the ordering check inside the proc macro. (asked `````@nnethercote````` about this on zulip, he didn't have any reservations about making this change) This has a couple of benefits: - tidy's "version sort" (thanks to rust-lang#141311 !) is nicer than the naive-cmp sort, so, e.g. `AtomicI{8, 16, 32, 64, 128}` are properly sorted by bit width. - consistency with the rest of the repo - allows us to remove a bit of order-verifying code from the `symbols!` proc macro impl

Rollup of 9 pull requests Successful merges: - #123476 (std::net: adding `unix_socket_exclbind` feature for solaris/illumos.) - #142708 (Do not include NUL-terminator in computed length) - #142963 (Skip unnecessary components in x64 try builds) - #142987 (rustdoc: show attributes on enum variants) - #143031 (Add windows-gnullvm hosts to the manifest) - #143082 (update internal `send_signal` comment) - #143110 (Use tidy to sort `sym::*` items) - #143111 (BTreeSet: remove duplicated code by reusing `from_sorted_iter`) - #143114 (Minor Documentation Improvements) r? `@ghost` `@rustbot` modify labels: rollup try-job: dist-i586-gnu-i586-i686-musl

rustbot assigned BoxyUwU Jun 27, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 27, 2025

This comment has been minimized.

Sign in to view

yotamofek force-pushed the pr/tidy-sort-for-symbols branch from cb27d40 to 7a3a7c0 Compare June 27, 2025 18:50

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 Jun 27, 2025

scottmcm assigned scottmcm and unassigned BoxyUwU Jun 27, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 28, 2025

nnethercote reviewed Jun 28, 2025

View reviewed changes

yotamofek force-pushed the pr/tidy-sort-for-symbols branch from 7a3a7c0 to bd91ca0 Compare June 28, 2025 08:19

Use tidy to sort sym::* items

00b64f8

yotamofek force-pushed the pr/tidy-sort-for-symbols branch from bd91ca0 to 00b64f8 Compare June 28, 2025 09:26

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 28, 2025

matthiaskrgr mentioned this pull request Jun 28, 2025

Rollup of 10 pull requests #143142

Closed

matthiaskrgr mentioned this pull request Jun 28, 2025

Rollup of 9 pull requests #143147

Closed

matthiaskrgr mentioned this pull request Jun 28, 2025

Rollup of 10 pull requests #143148

Closed

matthiaskrgr mentioned this pull request Jun 28, 2025

Rollup of 10 pull requests #143153

Closed

matthiaskrgr mentioned this pull request Jun 28, 2025

Rollup of 9 pull requests #143157

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Use tidy to sort `sym::*` items #143110

Use tidy to sort `sym::*` items #143110

yotamofek commented Jun 27, 2025 •

edited by rustbot

Loading

Uh oh!

rustbot commented Jun 27, 2025

Uh oh!

This comment has been minimized.

scottmcm commented Jun 27, 2025

Uh oh!

bors commented Jun 27, 2025

Uh oh!

nnethercote commented Jun 28, 2025

Uh oh!

nnethercote Jun 28, 2025

Uh oh!

nnethercote Jun 28, 2025

Uh oh!

yotamofek Jun 28, 2025

Uh oh!

nnethercote Jun 28, 2025

Uh oh!

yotamofek Jun 28, 2025

Uh oh!

nnethercote commented Jun 28, 2025

Uh oh!

bors commented Jun 28, 2025

Uh oh!

Uh oh!

		@@ -158,6 +158,7 @@ symbols! {
		// There is currently no checking that all symbols are used; that would be

Use tidy to sort sym::* items #143110

Are you sure you want to change the base?

Use tidy to sort sym::* items #143110

Conversation

yotamofek commented Jun 27, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 27, 2025

Uh oh!

This comment has been minimized.

scottmcm commented Jun 27, 2025

Uh oh!

bors commented Jun 27, 2025

Uh oh!

nnethercote commented Jun 28, 2025

Uh oh!

nnethercote Jun 28, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote Jun 28, 2025

Choose a reason for hiding this comment

Uh oh!

yotamofek Jun 28, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote Jun 28, 2025

Choose a reason for hiding this comment

Uh oh!

yotamofek Jun 28, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Jun 28, 2025

Uh oh!

bors commented Jun 28, 2025

Uh oh!

Uh oh!

Use tidy to sort `sym::*` items #143110

Use tidy to sort `sym::*` items #143110

yotamofek commented Jun 27, 2025 •

edited by rustbot

Loading