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

Consolidate two almost duplicated fn info extraction routines #106171

Merged
merged 2 commits into from
Jan 15, 2023
Merged

Consolidate two almost duplicated fn info extraction routines #106171

merged 2 commits into from
Jan 15, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Dec 27, 2022 •
edited
Loading

Moves extract_callable_info up to trait selection, because it was being (almost) duplicated fully there for similar diagnostic purposes. This also generalizes the diagnostics we can give slightly (see UI test).

@rustbot
Copy link
Collaborator

rustbot commented Dec 27, 2022

r? @lcnr

(rustbot has picked a reviewer for you, use r? to override)

@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 27, 2022
@bors
Copy link
Contributor

bors commented Jan 7, 2023

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

estebank
estebank approved these changes Jan 9, 2023
View reviewed changes
Copy link
Contributor

@estebank estebank left a comment

Choose a reason for hiding this comment

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

r=me

lcnr
lcnr reviewed Jan 9, 2023
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

didn't go through it in too much detail but that seems right and esteban already reviewed it.

r=estebank,me after nit

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated Show resolved Hide resolved
@compiler-errors compiler-errors force-pushed the consolidate-extract_callable_info branch from ed9c5f6 to 1ef510c Compare January 9, 2023 18:08
@compiler-errors
Copy link
Member Author

@bors r=estebank,lcnr

@bors
Copy link
Contributor

bors commented Jan 9, 2023

📌 Commit 1ef510c3a2eb74db14dc79a268975201f7f66bf7 has been approved by estebank,lcnr

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 9, 2023
@ehuss
Copy link
Contributor

ehuss commented Jan 11, 2023

@bors r-

As of #106458, the src/test directory has moved to tests. I think this PR will need to be updated.

@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 11, 2023
@compiler-errors compiler-errors force-pushed the consolidate-extract_callable_info branch from 1ef510c to 24bb36e Compare January 11, 2023 20:08
@compiler-errors
Copy link
Member Author

Rebased

@bors r=estebank,lcnr

@bors
Copy link
Contributor

bors commented Jan 11, 2023

📌 Commit 24bb36e has been approved by estebank,lcnr

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 Jan 11, 2023
@ehuss
Copy link
Contributor

ehuss commented Jan 11, 2023

It looks like this PR still adds two files to src/test? That is src/test/ui/suggestions/call-on-unimplemented-with-autoderef.rs and src/test/ui/suggestions/call-on-unimplemented-with-autoderef.stderr.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 12, 2023
@matthiaskrgr
Rollup merge of rust-lang#106171 - compiler-errors:consolidate-extrac…
5ee1323 
…t_callable_info, r=estebank,lcnr

Consolidate two almost duplicated fn info extraction routines

Moves `extract_callable_info` up to trait selection, because it was being (almost) duplicated fully there for similar diagnostic purposes. This also generalizes the diagnostics we can give slightly (see UI test).
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 12, 2023
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jan 12, 2023
@Dylan-DPC
Rollup merge of rust-lang#106171 - compiler-errors:consolidate-extrac…
c09bd57 
…t_callable_info, r=estebank,lcnr

Consolidate two almost duplicated fn info extraction routines

Moves `extract_callable_info` up to trait selection, because it was being (almost) duplicated fully there for similar diagnostic purposes. This also generalizes the diagnostics we can give slightly (see UI test).
@Dylan-DPC Dylan-DPC mentioned this pull request Jan 12, 2023
Closed
@compiler-errors
Copy link
Member Author

compiler-errors commented Jan 12, 2023 •
edited
Loading

I'm a fool, along with @ehuss's comment, this conflicts with another PR.

@bors r-

@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 12, 2023
@compiler-errors compiler-errors force-pushed the consolidate-extract_callable_info branch 2 times, most recently from 94c8b50 to 9ab20a2 Compare January 12, 2023 06:31
@compiler-errors compiler-errors force-pushed the consolidate-extract_callable_info branch from 9ab20a2 to 29fcfb4 Compare January 13, 2023 22:12
@compiler-errors compiler-errors force-pushed the consolidate-extract_callable_info branch from 29fcfb4 to c1a7dbc Compare January 13, 2023 22:43
@compiler-errors
Copy link
Member Author

@bors r=estebank,lcnr

@bors
Copy link
Contributor

bors commented Jan 15, 2023

📌 Commit c1a7dbc has been approved by estebank,lcnr

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 Jan 15, 2023
@bors
Copy link
Contributor

bors commented Jan 15, 2023

⌛ Testing commit c1a7dbc with merge fc11ee0...

@bors
Copy link
Contributor

bors commented Jan 15, 2023

☀️ Test successful - checks-actions
Approved by: estebank,lcnr
Pushing fc11ee0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 15, 2023
@bors bors merged commit fc11ee0 into rust-lang:master Jan 15, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 15, 2023
@bors bors mentioned this pull request Jan 15, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (fc11ee0): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.3% [0.3%, 0.3%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.6% [2.6%, 2.6%] 1
Regressions ❌
(secondary)		 2.2% [0.9%, 3.3%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.6% [2.6%, 2.6%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@compiler-errors compiler-errors deleted the consolidate-extract_callable_info branch August 11, 2023 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

@estebank estebank estebank approved these changes

Assignees

@lcnr lcnr

Labels
merged-by-bors This PR was explicitly merged by bors. 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.68.0
Development

Successfully merging this pull request may close these issues.
7 participants
@compiler-errors @rustbot @bors @ehuss @rust-timer @estebank @lcnr