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.

Sign up for GitHub

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

Jump to bottom

Unify secondary_span and swap_secondary_and_primary args in note_type_err #131753

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Unify secondary_span and swap_secondary_and_primary args in note_type_err #131753

merged 1 commit into from
Oct 16, 2024

Conversation

compiler-errors
Copy link
Member

Tiny tweak b/c working w note_type_err is kinda a mess.

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

r? @TaKO8Ki

rustbot has assigned @TaKO8Ki.
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 Oct 15, 2024
@compiler-errors compiler-errors changed the title Unify secondary_span and swap_secondary_and_primary Unify secondary_span and swap_secondary_and_primary args in note_type_err Oct 15, 2024
jieyouxu
jieyouxu approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, this seems less confusing. I do have one suggestion for adding an enum for the note order, but if you think that's overkill then you can just r=me.

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs Show resolved Hide resolved
@jieyouxu jieyouxu assigned jieyouxu and unassigned TaKO8Ki Oct 16, 2024
@compiler-errors
Copy link
Member Author

compiler-errors commented Oct 16, 2024 •
edited
Loading

I think it's overkill only because the note ordering is not necessary for correctness. If it were off the diagnostic path or utilized (true) in more than one callsite then maybe.

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Oct 16, 2024

📌 Commit 4886e9a has been approved by jieyouxu

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 Oct 16, 2024
Urgau added a commit to Urgau/rust that referenced this pull request Oct 16, 2024
@Urgau
Rollup merge of rust-lang#131753 - compiler-errors:swap-secondary, r=…
610ad60 
…jieyouxu

Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`

Tiny tweak b/c working w `note_type_err` is kinda a mess.
@Urgau Urgau mentioned this pull request Oct 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@bors
Auto merge of rust-lang#131785 - Urgau:rollup-v431zf4, r=Urgau
a73daed 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#129181 (Pass end position of span through inline ASM cookie)
 - rust-lang#130989 (Don't check unsize goal in MIR validation when opaques remain)
 - rust-lang#131657 (Rustfmt `for<'a> async` correctly)
 - rust-lang#131691 (Delay ambiguous intra-doc link resolution after `Cache` has been populated)
 - rust-lang#131730 (Refactor some `core::fmt` macros)
 - rust-lang#131751 (Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe)
 - rust-lang#131753 (Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`)
 - rust-lang#131776 (Emscripten: Xfail backtrace ui tests)
 - rust-lang#131777 (Fix trivially_copy_pass_by_ref in stable_mir)
 - rust-lang#131778 (Fix needless_lifetimes in stable_mir)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 16, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@bors
Auto merge of rust-lang#131797 - matthiaskrgr:rollup-lzpze2k, r=matth…
798fb83 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#130989 (Don't check unsize goal in MIR validation when opaques remain)
 - rust-lang#131657 (Rustfmt `for<'a> async` correctly)
 - rust-lang#131691 (Delay ambiguous intra-doc link resolution after `Cache` has been populated)
 - rust-lang#131730 (Refactor some `core::fmt` macros)
 - rust-lang#131751 (Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe)
 - rust-lang#131753 (Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`)
 - rust-lang#131776 (Emscripten: Xfail backtrace ui tests)
 - rust-lang#131777 (Fix trivially_copy_pass_by_ref in stable_mir)
 - rust-lang#131778 (Fix needless_lifetimes in stable_mir)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 80cbc6d into rust-lang:master Oct 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@rust-timer
Unrolled build for rust-lang#131753
8bd00af 
Rollup merge of rust-lang#131753 - compiler-errors:swap-secondary, r=jieyouxu

Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`

Tiny tweak b/c working w `note_type_err` is kinda a mess.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

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.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@compiler-errors @rustbot @bors @jieyouxu @TaKO8Ki