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

Split hir ty lowerer's error reporting code in check functions to mod errors. #122865

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Split hir ty lowerer's error reporting code in check functions to mod errors. #122865

merged 1 commit into from
Apr 3, 2024

Conversation

surechen
Copy link
Contributor

Move some error report codes to mod astconv/errors.rs

r? @lcnr

@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 Mar 22, 2024
lcnr
lcnr reviewed Mar 22, 2024
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.

some desired changes, HOWEVER, wait until #120926 has been merged as that change will require a potentiall painful rebase. It may even be easier to reimplement this PR from scratch '^^

compiler/rustc_hir_analysis/src/astconv/errors.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/astconv/errors.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Mar 22, 2024

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

@workingjubilee
Copy link
Member

astconv is kill
@rustbot author

@rustbot rustbot 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 Mar 22, 2024
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from 83cafab to fcb3dcb Compare March 23, 2024 17:27
@rustbot
Copy link
Collaborator

rustbot commented Mar 23, 2024

HIR ty lowering was modified

cc @fmease

@fmease fmease changed the title Split astconv's error report code in check functions to mod errors. Split hir ty lowerer's error reporting code in check functions to mod errors. Mar 23, 2024
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from fcb3dcb to f9a328f Compare March 23, 2024 17:32
@surechen
Copy link
Contributor Author

surechen commented Mar 23, 2024 •
edited
Loading

astconv is kill @rustbot author

Thank you for your reminder @workingjubilee

@surechen
Copy link
Contributor Author

HIR ty lowering was modified

cc @fmease

Thank you for helping me edit title. @fmease

@surechen
Copy link
Contributor Author

some desired changes, HOWEVER, wait until #120926 has been merged as that change will require a potentiall painful rebase. It may even be easier to reimplement this PR from scratch '^^

Thank you very much.If CI does not complain, please help me continue to review. I tested it locally and I think there should be no tests error.

@surechen surechen requested a review from lcnr March 23, 2024 17:47
@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 23, 2024
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from f9a328f to 7940303 Compare March 24, 2024 12:28
lcnr
lcnr reviewed Mar 24, 2024
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.

r=me after final nit

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs Outdated Show resolved Hide resolved
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from 7940303 to 71fd305 Compare March 25, 2024 07:03
@surechen surechen requested a review from lcnr March 27, 2024 04:54
lcnr
lcnr reviewed Apr 2, 2024
View reviewed changes
compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs Outdated
Comment on lines 1279 to 1280
pub struct EnumVariantsGenericsErrExtend<'tcx> {
pub tcx: TyCtxt<'tcx>,

This comment was marked as outdated.

Sign in to view

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs Outdated Show resolved Hide resolved
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from 71fd305 to 0f57ff8 Compare April 2, 2024 11:21
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@surechen
t plit astconv's error report code in check functions to mod errors.
1012218 
Move some error report codes to mod `astconv/errors.rs`
@surechen surechen force-pushed the refactor_astconv_error_report_20240321 branch from 0f57ff8 to 1012218 Compare April 2, 2024 12:14
@lcnr
Copy link
Contributor

lcnr commented Apr 2, 2024

thanks ❤️

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 2, 2024

📌 Commit 1012218 has been approved by 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 Apr 2, 2024
@jhpratt jhpratt mentioned this pull request Apr 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2024
@bors
Auto merge of rust-lang#123396 - jhpratt:rollup-oa54mh1, r=jhpratt
b688d53 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#122865 (Split hir ty lowerer's error reporting code in check functions to mod errors.)
 - rust-lang#122935 (rename ptr::from_exposed_addr -> ptr::with_exposed_provenance)
 - rust-lang#123182 (Avoid expanding to unstable internal method)
 - rust-lang#123203 (Add `Context::ext`)
 - rust-lang#123380 (Improve bootstrap comments)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0697ee9 into rust-lang:master Apr 3, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2024
@rust-timer
Unrolled build for rust-lang#122865
75bd1fd 
Rollup merge of rust-lang#122865 - surechen:refactor_astconv_error_report_20240321, r=lcnr

Split hir ty lowerer's error reporting code in check functions to mod errors.

Move some error report codes to mod `astconv/errors.rs`

r? `@lcnr`
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

Assignees

@lcnr lcnr

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

Successfully merging this pull request may close these issues.
6 participants
@surechen @bors @workingjubilee @rustbot @rust-log-analyzer @lcnr