Skip to content

tidy-alphabetical: fix line number in error message#154213

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
scrabsha:push-znnnnwtwxntz
Apr 2, 2026
Merged

tidy-alphabetical: fix line number in error message#154213
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
scrabsha:push-znnnnwtwxntz

Conversation

@scrabsha

@scrabsha scrabsha commented Mar 22, 2026

Copy link
Copy Markdown
Contributor

the comment should explain the situation. if it does not please let me know and i'll try to make it better :3

@rustbot rustbot added A-tidy Area: The tidy tool S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 22, 2026
@rust-log-analyzer

This comment has been minimized.

@scrabsha scrabsha force-pushed the push-znnnnwtwxntz branch from a23ae00 to 8946711 Compare March 22, 2026 12:53
@reddevilmidzy

Copy link
Copy Markdown
Member

If you want to verify CI pass, you can open a PR as a draft without needing to add a block label. S-waiting-author label includes that meaning.

@reddevilmidzy reddevilmidzy removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 22, 2026
@scrabsha

Copy link
Copy Markdown
Contributor Author

r? WaffleLapkin (you reworked this bit a few months ago, so i figured you'd be a good entity to ask a review from hehe)

@rustbot ready

@rustbot

rustbot commented Mar 22, 2026

Copy link
Copy Markdown
Collaborator

WaffleLapkin is currently at their maximum review capacity.
They may take a while to respond.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 22, 2026
@scrabsha scrabsha marked this pull request as ready for review March 22, 2026 15:28
// tidy-alphabetical-end
";
bad(lines, "bad:2: line not in alphabetical order (tip: use --bless to sort this list)");
bad(lines, "bad:3: line not in alphabetical order (tip: use --bless to sort this list)");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lines are typically 1-indexed, so shouldn't this actually point to 4?

@scrabsha scrabsha Apr 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

mhm, the first line of lines is // tidy-alphabetical-start1 and this lint points at the first line that needs changes, which is xyz, aka the third line

that's how i understand it, but maybe i'm wrong?

Footnotes

  1. i wasn't sure so i wrote a cute lill test for it: playground

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

M, no, you are right. For some reason I thought that in a c b the problem is in b which needs to be between a/c, but it is just as meaningful to say that the problem is c which needs to be after b.

@WaffleLapkin WaffleLapkin 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 2, 2026
@WaffleLapkin

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-bors Bot commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 8946711 has been approved by WaffleLapkin

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Apr 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Apr 2, 2026
…leLapkin

tidy-alphabetical: fix line number in error message
rust-bors Bot pushed a commit that referenced this pull request Apr 2, 2026
Rollup of 11 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 2, 2026
…leLapkin

tidy-alphabetical: fix line number in error message
rust-bors Bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 21 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153286 (various fixes for scalable vectors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #154713 (Stop compiling when we get resolving crate failure)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 2, 2026
…leLapkin

tidy-alphabetical: fix line number in error message
rust-bors Bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 21 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153286 (various fixes for scalable vectors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #153614 (`FindParamInClause` handle edge-cases)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
rust-bors Bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 20 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #153614 (`FindParamInClause` handle edge-cases)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
@rust-bors rust-bors Bot merged commit 2454f84 into rust-lang:main Apr 2, 2026
11 checks passed
rust-timer added a commit that referenced this pull request Apr 2, 2026
Rollup merge of #154213 - scrabsha:push-znnnnwtwxntz, r=WaffleLapkin

tidy-alphabetical: fix line number in error message
github-actions Bot pushed a commit to rust-lang/miri that referenced this pull request Apr 3, 2026
…uwer

Rollup of 20 pull requests

Successful merges:

 - rust-lang/rust#153105 (Compute the result of a projection type with region errors)
 - rust-lang/rust#153532 (Attributes containing rustc)
 - rust-lang/rust#153960 (Make `layout_of` cycles fatal errors)
 - rust-lang/rust#154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - rust-lang/rust#154666 (Remove `StableHashContext` impls)
 - rust-lang/rust#154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - rust-lang/rust#154710 (opaque_generic_const_args -> generic_const_args)
 - rust-lang/rust#154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - rust-lang/rust#153614 (`FindParamInClause` handle edge-cases)
 - rust-lang/rust#154213 (tidy-alphabetical: fix line number in error message)
 - rust-lang/rust#154425 (Migrate transmute tests)
 - rust-lang/rust#154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - rust-lang/rust#154469 (mGCA: Lower spans for literal const args)
 - rust-lang/rust#154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - rust-lang/rust#154615 (Moving issues)
 - rust-lang/rust#154644 (rustdoc: seperate methods and associated functions in sidebar)
 - rust-lang/rust#154660 (Avoid creating async return opaques for foreign async fns)
 - rust-lang/rust#154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - rust-lang/rust#154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - rust-lang/rust#154709 (Revert `Ty` type alias in `rustc_type_ir`)
@scrabsha scrabsha deleted the push-znnnnwtwxntz branch April 3, 2026 13:21
@cuviper cuviper added this to the 1.96.0 milestone Apr 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tidy Area: The tidy tool S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants