Skip to content

Small rustc_resolve cleanups#135677

Merged
bors merged 2 commits intorust-lang:masterfrom
yotamofek:resolve-cleanups2
Feb 12, 2025
Merged

Small rustc_resolve cleanups#135677
bors merged 2 commits intorust-lang:masterfrom
yotamofek:resolve-cleanups2

Conversation

@yotamofek
Copy link
Contributor

@yotamofek yotamofek commented Jan 18, 2025

  1. Don't open-code Reverse
  2. Use slice patterns where possible

@rustbot
Copy link
Collaborator

rustbot commented Jan 18, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 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 Jan 18, 2025
compiler-errors
compiler-errors suggested changes Jan 18, 2025
View reviewed changes
compiler/rustc_resolve/src/diagnostics.rs Outdated
None
extern_crate_names.sort_by_key(|&name| Reverse(name));

extern_crate_names
Copy link
Contributor

@compiler-errors compiler-errors Jan 18, 2025

Choose a reason for hiding this comment

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

I feel like this is harder to read than the existing code. Can you revert it?

Copy link
Contributor Author

@yotamofek yotamofek Jan 18, 2025

Choose a reason for hiding this comment

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

Yeah, you're right, also doesn't fit the commit it was in. Reverted.

Copy link
Contributor Author

@yotamofek yotamofek Jan 18, 2025

Choose a reason for hiding this comment

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

Using Reverse here was actually wrong because I was ordering by Symbol (which orders by index) instead of its string repr. Unfortunately I had to revert to sort_by because of lifetime issues, but at least I could still use total ordering instead of partial.

@compiler-errors
Copy link
Contributor

compiler-errors commented Jan 18, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

📌 Commit a909520 has been approved by compiler-errors

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 Jan 18, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 18, 2025
@matthiaskrgr
Rollup merge of rust-lang#135677 - yotamofek:resolve-cleanups2, r=com…
9d99f9c 
…piler-errors

Small `rustc_resolve` cleanups

1. Don't open-code `Reverse`
2. Use slice patterns where possible
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 18, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2025
@bors
Auto merge of rust-lang#135702 - matthiaskrgr:rollup-7m0e58h, r=matth…
43aa137 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#135616 (CI: split i686-msvc job to two free runners)
 - rust-lang#135623 (ci: use ghcr ubuntu image for mingw-check-tidy)
 - rust-lang#135640 (Drop MIPS glibc 2.23 patches that reside in crosstool-ng now)
 - rust-lang#135663 (Fix ICE in resolving associated items as non-bindings)
 - rust-lang#135677 (Small `rustc_resolve` cleanups)
 - rust-lang#135680 (coverage: Clean up a few things after the counters overhaul)
 - rust-lang#135697 (Get rid of `ToPolyTraitRef`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jan 20, 2025

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

@bors 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 Jan 20, 2025
@yotamofek yotamofek force-pushed the resolve-cleanups2 branch 2 times, most recently from 505585f to 9cd875b Compare January 20, 2025 21:26
@aDotInTheVoid
Copy link
Member

aDotInTheVoid commented Feb 11, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Feb 11, 2025

📌 Commit ce0b72a has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 11, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Feb 11, 2025
@jhpratt
Rollup merge of rust-lang#135677 - yotamofek:resolve-cleanups2, r=com…
bd691f9 
…piler-errors

Small `rustc_resolve` cleanups

1. Don't open-code `Reverse`
2. Use slice patterns where possible
@jhpratt jhpratt mentioned this pull request Feb 11, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2025
@bors
Auto merge of rust-lang#136850 - jhpratt:rollup-rm72dxb, r=jhpratt
bd68693 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#134999 (Add cygwin target.)
 - rust-lang#135677 (Small `rustc_resolve` cleanups)
 - rust-lang#136699 (std: replace the `FromInner` implementation for addresses with private conversion functions)
 - rust-lang#136758 (tests: `-Copt-level=3` instead of `-O` in assembly tests)
 - rust-lang#136761 (tests: `-Copt-level=3` instead of `-O` in codegen tests)
 - rust-lang#136833 (compiler: die immediately instead of handling unknown target codegen)

Failed merges:

 - rust-lang#136808 (Try to recover from path sep error in type parsing)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 11, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2025
@bors
Auto merge of rust-lang#136878 - matthiaskrgr:rollup-opilhjv, r=matth…
9e34e60 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#135285 (it-self → itself, build-system → build system, type-alias → type alias)
 - rust-lang#135677 (Small `rustc_resolve` cleanups)
 - rust-lang#136239 (show supported register classes in error message)
 - rust-lang#136246 (include note on variance and example)
 - rust-lang#136354 (Update docs for impl keyword)
 - rust-lang#136786 (Remove the deduplicate_blocks pass)
 - rust-lang#136833 (compiler: die immediately instead of handling unknown target codegen)
 - rust-lang#136847 (Simplify intra-crate qualifiers.)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2025
@bors
Auto merge of rust-lang#136878 - matthiaskrgr:rollup-opilhjv, r=matth…
34a5ea9 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#135285 (it-self → itself, build-system → build system, type-alias → type alias)
 - rust-lang#135677 (Small `rustc_resolve` cleanups)
 - rust-lang#136239 (show supported register classes in error message)
 - rust-lang#136246 (include note on variance and example)
 - rust-lang#136354 (Update docs for impl keyword)
 - rust-lang#136786 (Remove the deduplicate_blocks pass)
 - rust-lang#136833 (compiler: die immediately instead of handling unknown target codegen)
 - rust-lang#136847 (Simplify intra-crate qualifiers.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 09ee4e7 into rust-lang:master Feb 12, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 12, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 12, 2025
@rust-timer
Unrolled build for rust-lang#135677
5f15394 
Rollup merge of rust-lang#135677 - yotamofek:resolve-cleanups2, r=compiler-errors

Small `rustc_resolve` cleanups

1. Don't open-code `Reverse`
2. Use slice patterns where possible
@yotamofek yotamofek deleted the resolve-cleanups2 branch February 14, 2025 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@compiler-errors compiler-errors compiler-errors requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errors compiler-errors

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.86.0

Development

Successfully merging this pull request may close these issues.

6 participants

@yotamofek @rustbot @compiler-errors @bors @aDotInTheVoid @jieyouxu