Diagnostic translation for borrow_check:errors #112237
Closed
sladyn98 wants to merge 3 commits intorust-lang:masterfrom
Closed
Diagnostic translation for borrow_check:errors #112237sladyn98 wants to merge 3 commits intorust-lang:masterfrom
borrow_check:errors #112237sladyn98 wants to merge 3 commits intorust-lang:masterfrom
Conversation
rustbot
added
S-waiting-on-review
sladyn98
commented
Jun 3, 2023
| err.span_label(borrow_span, format!("{} is borrowed here", borrow_desc)); | ||
| err.span_label(span, format!("use of borrowed {}", borrow_desc)); | ||
| err | ||
| create_err(CannotUseWhenMutablyBorrowed { span, desc }) |
Contributor
Author
There was a problem hiding this comment.
@davidtwco Not sure how to use the create_err here after creating the struct
Member
There was a problem hiding this comment.
Use self.infcx.tcx.sess.create_err, create_err isn't a free-standing function :)
This comment has been minimized.
This comment has been minimized.
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
Do we have to bless these tests or fix them manually : ) |
Contributor
|
These tests are crashing because of a bug in this PR: |
Contributor
|
Whoops, wrong button. |
compiler-errors
suggested changes
Jun 7, 2023
| pub(crate) struct CannotUseWhenMutablyBorrowed<'a> { | ||
| #[primary_span] | ||
| pub span: Span, | ||
| #[label] |
Contributor
There was a problem hiding this comment.
There is no corresponding label in the ftl file.
Contributor
Author
There was a problem hiding this comment.
I am still trying to understand how to use them, would just including the rest of the parameters under primary span work ? I can then just put their placeholders in the ftl file. I read the documentation but I was not really sure how to incorporate them in the .ftl file
Member
There was a problem hiding this comment.
Adding a #[label] is a reference to a .label = <msg> attribute on the borrowck_cannot_use_when_mutably_borrowed message, so it should have something like:
borrowck_cannot_use_when_mutably_borrowed = cannot use `{$desc}` when mutably borrowed
.label = <msg>
| self.infcx.tcx.sess.create_err(CannotUseWhenMutablyBorrowed { | ||
| span, | ||
| E0503, | ||
| "cannot use {} because it was mutably borrowed", |
Contributor
There was a problem hiding this comment.
Why did you change the wording from here to "cannot use {$desc} when mutably borrowed"?
Contributor
Author
There was a problem hiding this comment.
I read some of the examples in the ftl file and there were certain placeholders there so since desc would be put in here in the message I thought {desc} would be also substituted in the ftl file from the struct passed in.
Contributor
Author
There was a problem hiding this comment.
I might be completely wrong, feel free to correct me
Contributor
There was a problem hiding this comment.
I meant, why did you change the wording? The old phrasing was "because it was mutably borrowed", the new phrasing is "when mutably borrowed"? I think we should separate diagnostics migration from tweaks of wording.
Comment on lines
-40
to
-41
| err.span_label(borrow_span, format!("{} is borrowed here", borrow_desc)); | ||
| err.span_label(span, format!("use of borrowed {}", borrow_desc)); |
Contributor
There was a problem hiding this comment.
These labels weren't added to the ftl file, where did they go?
Contributor
Author
There was a problem hiding this comment.
Should they be added as separate messages with their labels something like this
borrowck_cannot_use_when_mutably_borrowed = {$borrow_span} is borrowed here
Contributor
There was a problem hiding this comment.
You should preserve all the error messages as much as possible
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
@rustbot author |
rustbot
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #114116) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
@sladyn98 any updates on this? |
Member
|
Closing this as inactive. Feel free to reöpen this pr or create a new pr if you get the time to work on this. Thanks |
Dylan-DPC
added
S-inactive
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Migrate diagnostics to use the struct derive and be translatable.
r? @davidtwco