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

Handle fndef rendering together with signature rendering #134354

Merged
merged 1 commit into from
Dec 17, 2024
Merged

Handle fndef rendering together with signature rendering #134354

merged 1 commit into from
Dec 17, 2024
+29 −23

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Dec 15, 2024 •
edited
Loading

Pulled out of #134353

Changes some highlighting in type mismatch errors around fndefs

@rustbot
Copy link
Collaborator

rustbot commented Dec 15, 2024

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 Dec 15, 2024
oli-obk
oli-obk commented Dec 15, 2024
View reviewed changes
compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs
}

(ty::FnDef(did1, args1), ty::FnPtr(sig_tys2, hdr2)) => {
let sig1 = self.tcx.fn_sig(*did1).instantiate(self.tcx, args1);
let mut values = self.cmp_fn_sig(&sig1, &sig_tys2.with(*hdr2));
values.0.push_highlighted(format!(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously only the fn path on the lhs was highlighted, but not on the rhs (the arm below uses push_normal)

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 15, 2024

📌 Commit cd104a7 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 Dec 15, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 16, 2024
@GuillaumeGomez
Rollup merge of rust-lang#134354 - oli-obk:push-nlrxswvpqnuk, r=compi…
f87653f 
…ler-errors

Handle fndef rendering together with signature rendering

Pulled out of rust-lang#134353

Changes some highlighting in type mismatch errors around fndefs
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134359 - GuillaumeGomez:rollup-xszgc84, r=Gui…
80bcb8e 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#134111 (Fix `--nocapture` for run-make tests)
 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134314 (Make sure to use normalized ty for unevaluated const in default struct value)
 - rust-lang#134329 (Add m68k_target_feature)
 - rust-lang#134342 (crashes: more tests)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)

Failed merges:

 - rust-lang#133265 (Add a range argument to vec.extract_if)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2024
@matthiaskrgr
Rollup merge of rust-lang#134354 - oli-obk:push-nlrxswvpqnuk, r=compi…
d778dda 
…ler-errors

Handle fndef rendering together with signature rendering

Pulled out of rust-lang#134353

Changes some highlighting in type mismatch errors around fndefs
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134360 - matthiaskrgr:rollup-5ckix8i, r=matth…
fcbc153 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134314 (Make sure to use normalized ty for unevaluated const in default struct value)
 - rust-lang#134342 (crashes: more tests)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu assigned compiler-errors and unassigned jieyouxu Dec 16, 2024
@matthiaskrgr
Copy link
Member

@bors r-

#134360 (comment)

@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 Dec 16, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented Dec 16, 2024

blessed windows output, too

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Dec 16, 2024

📌 Commit e40a494 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 Dec 16, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2024
@matthiaskrgr
Rollup merge of rust-lang#134354 - oli-obk:push-nlrxswvpqnuk, r=compi…
081c440 
…ler-errors

Handle fndef rendering together with signature rendering

Pulled out of rust-lang#134353

Changes some highlighting in type mismatch errors around fndefs
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134380 - matthiaskrgr:rollup-a47jc6z, r=matth…
a79fb6a 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)
 - rust-lang#134368 (Use links to edition guide for edition migrations)
 - rust-lang#134371 (Check for array lengths that aren't actually `usize`)
 - rust-lang#134378 (An octuple of polonius fact generation cleanups)

Failed merges:

 - rust-lang#134365 (Rename `rustc_mir_build::build` to `builder`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134380 - matthiaskrgr:rollup-a47jc6z, r=matth…
dd8feec 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)
 - rust-lang#134368 (Use links to edition guide for edition migrations)
 - rust-lang#134371 (Check for array lengths that aren't actually `usize`)
 - rust-lang#134378 (An octuple of polonius fact generation cleanups)

Failed merges:

 - rust-lang#134365 (Rename `rustc_mir_build::build` to `builder`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134380 - matthiaskrgr:rollup-a47jc6z, r=matth…
e823167 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)
 - rust-lang#134368 (Use links to edition guide for edition migrations)
 - rust-lang#134371 (Check for array lengths that aren't actually `usize`)
 - rust-lang#134378 (An octuple of polonius fact generation cleanups)

Failed merges:

 - rust-lang#134365 (Rename `rustc_mir_build::build` to `builder`)

r? `@ghost`
`@rustbot` modify labels: rollup
jhpratt added a commit to jhpratt/rust that referenced this pull request Dec 17, 2024
@jhpratt
Rollup merge of rust-lang#134354 - oli-obk:push-nlrxswvpqnuk, r=compi…
cdb61ba 
…ler-errors

Handle fndef rendering together with signature rendering

Pulled out of rust-lang#134353

Changes some highlighting in type mismatch errors around fndefs
@jhpratt jhpratt mentioned this pull request Dec 17, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 17, 2024
@bors
Auto merge of rust-lang#134411 - jhpratt:rollup-3ozrvej, r=jhpratt
124dab9 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#133265 (Add a range argument to vec.extract_if)
 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)
 - rust-lang#134365 (Rename `rustc_mir_build::build` to `builder`)
 - rust-lang#134368 (Use links to edition guide for edition migrations)
 - rust-lang#134388 (Update books)
 - rust-lang#134397 (rustc_borrowck: Suggest changing `&raw const` to `&raw mut` if applicable)
 - rust-lang#134398 (AIX: add alignment info for test)
 - rust-lang#134400 (Fix some comments related to upvars handling)

Failed merges:

 - rust-lang#134399 (Do not do if ! else, use unnegated cond and swap the branches instead)

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt jhpratt mentioned this pull request Dec 17, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 17, 2024
@bors
Auto merge of rust-lang#134414 - jhpratt:rollup-4gtfd1h, r=jhpratt
f23a80a 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
 - rust-lang#134354 (Handle fndef rendering together with signature rendering)
 - rust-lang#134365 (Rename `rustc_mir_build::build` to `builder`)
 - rust-lang#134368 (Use links to edition guide for edition migrations)
 - rust-lang#134397 (rustc_borrowck: Suggest changing `&raw const` to `&raw mut` if applicable)
 - rust-lang#134398 (AIX: add alignment info for test)
 - rust-lang#134400 (Fix some comments related to upvars handling)
 - rust-lang#134406 (Fix `-Z input-stats` ordering)
 - rust-lang#134409 (bootstrap: fix a comment)
 - rust-lang#134412 (small borrowck cleanup)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e7407b3 into rust-lang:master Dec 17, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 17, 2024
@rust-timer
Unrolled build for rust-lang#134354
6ead676 
Rollup merge of rust-lang#134354 - oli-obk:push-nlrxswvpqnuk, r=compiler-errors

Handle fndef rendering together with signature rendering

Pulled out of rust-lang#134353

Changes some highlighting in type mismatch errors around fndefs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @rustbot @compiler-errors @bors @matthiaskrgr @jieyouxu