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

Avoid unwrap diag.code directly in note_and_explain_type_err #125774

Merged
merged 1 commit into from
May 31, 2024
Merged

Avoid unwrap diag.code directly in note_and_explain_type_err #125774

merged 1 commit into from
May 31, 2024

Conversation

mu001999
Copy link
Contributor

Fixes #125757

@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

r? @petrochenkov

rustbot has assigned @petrochenkov.
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 May 30, 2024
@petrochenkov
Copy link
Contributor

r? types

@rustbot rustbot added the T-types Relevant to the types team, which will review and decide on the PR/issue. label May 30, 2024
@rustbot rustbot assigned jackh726 and unassigned petrochenkov May 30, 2024
compiler-errors
compiler-errors requested changes May 30, 2024
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

I don't believe this is the correct fix for the issue.

@compiler-errors
Copy link
Member

I think the correct fix here would be to just stop unwrapping here and more gracefully handle the case where the diagnostic has no error code:

rust/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs

Line 666 in debd22d

if tcx.sess.teach(diag.code.unwrap()) {

Though it would be most thorough to first explain why we're calling the expected_projection method here at all.

@mu001999 mu001999 requested a review from compiler-errors May 30, 2024 23:28
@mu001999
Copy link
Contributor Author

@compiler-errors how about the new change? I added a boolean to check the type is used as the type of a constant, which is forbidden.

@compiler-errors
Copy link
Member

This still seems like not the correct approach. What is wrong with the approach that I suggested in #125774 (comment)?

@mu001999 mu001999 changed the title Skip expected_projection if proj_ty is forbidden Avoid unwrap diag.code directly in note_and_explain_type_err May 30, 2024
@mu001999
Copy link
Contributor Author

@compiler-errors I tried this when I first touched this issue, it works indeed. But after skimming through the call logic, I just think we shouldn't call expected_projection if the projection appeared in a forbidden context, then we also don't want the new helps like:

   = help: consider constraining the associated type `<i32 as Trait>::Type` to `usize`

But I agree that current approach is enough.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 31, 2024

📌 Commit ed5205f 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 May 31, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request May 31, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@bors
Auto merge of rust-lang#125797 - matthiaskrgr:rollup-v2jmg7i, r=matth…
bf8fff7 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#125635 (Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup)
 - rust-lang#125774 (Avoid unwrap diag.code directly in note_and_explain_type_err)
 - rust-lang#125786 (Fold item bounds before proving them in `check_type_bounds` in new solver)
 - rust-lang#125790 (Don't recompute `tail` in `lower_stmts`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4aafc11 into rust-lang:master May 31, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 31, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@rust-timer
Unrolled build for rust-lang#125774
681f7d1 
Rollup merge of rust-lang#125774 - mu001999-contrib:fix/125757, r=compiler-errors

Avoid unwrap diag.code directly in note_and_explain_type_err

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->

Fixes rust-lang#125757
@mu001999 mu001999 deleted the fix/125757 branch June 26, 2024 14:10
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. T-types Relevant to the types team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
7 participants
@mu001999 @rustbot @petrochenkov @compiler-errors @rust-log-analyzer @bors @jackh726