Repository navigation
TypeMismatch quickfix position error: to_owned() - #22185
Merged
ChayimFriedman2 merged 2 commits intoOct 12, 2026
Merged
ChayimFriedman2 merged 2 commits into
ChayimFriedman2 merged 2 commits into
Conversation
This comment has been minimized.
This comment has been minimized.
WeiTheShinobi
marked this pull request as draft
April 26, 2026 14:49
to_owned()
WeiTheShinobi
force-pushed
the
fix_type_mismatch_str_ref_to_owned_block_tail_expr
branch
from
April 26, 2026 14:51
65b4fc7 to
94f431c
Compare
A4-Tacks
requested changes
Apr 26, 2026
|
|
||
| let edit = TextEdit::insert(range.end(), to_owned); | ||
| let mut edit_expr = expr.clone(); | ||
| while let ast::Expr::BlockExpr(block) = edit_expr.clone() { |
Member
There was a problem hiding this comment.
This is not a real fix
We should fix the emit of diagnostic because d: &hir::TypeMismatch<'_> points to { "" } instead of ""
Contributor
Author
There was a problem hiding this comment.
I moved the logic to where TypeMismatch is created and both cases have been solved,
Or should I fix this further upstream?
WeiTheShinobi
marked this pull request as ready for review
April 28, 2026 03:13
A4-Tacks
reviewed
Apr 28, 2026
| ExprOrPatId::ExprId(expr) => source_map.expr_syntax(expr).map(Either::Left), | ||
| ExprOrPatId::ExprId(mut expr) => { | ||
| while let Expr::Block { tail: Some(tail), .. } = &body[expr] { | ||
| expr = *tail; |
Member
There was a problem hiding this comment.
@ChayimFriedman2 I don't know if it's appropriate this, do you think?
Contributor
There was a problem hiding this comment.
I don't think this is the place. If we have adjustments to do and we can't do them when emitting the type mismatch, we should do them in ide-diagnostics.
This comment has been minimized.
This comment has been minimized.
WeiTheShinobi
force-pushed
the
fix_type_mismatch_str_ref_to_owned_block_tail_expr
branch
from
May 3, 2026 11:41
6514fc9 to
4c20a4d
Compare
This comment has been minimized.
This comment has been minimized.
WeiTheShinobi
marked this pull request as draft
May 3, 2026 12:37
WeiTheShinobi
force-pushed
the
fix_type_mismatch_str_ref_to_owned_block_tail_expr
branch
from
May 3, 2026 13:54
739a261 to
4c20a4d
Compare
WeiTheShinobi
marked this pull request as ready for review
May 3, 2026 14:20
A4-Tacks
reviewed
May 16, 2026
| let file_id = d.expr_or_pat.file_id; | ||
| let root = ctx.sema.db.parse_or_expand(file_id); | ||
| let mut expr = expr_ptr.to_node(&root); | ||
| while let ast::Expr::BlockExpr(block) = expr.clone() { |
Member
There was a problem hiding this comment.
I still hope to change fn emit_type_mismatch() or its calling site
This comment has been minimized.
This comment has been minimized.
WeiTheShinobi
force-pushed
the
fix_type_mismatch_str_ref_to_owned_block_tail_expr
branch
from
October 1, 2026 14:13
4c20a4d to
74d6613
Compare
Collaborator
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
A4-Tacks
reviewed
Oct 1, 2026
| }; | ||
|
|
||
| #[test] | ||
| fn str_ref_to_owned_in_block() { |
Member
There was a problem hiding this comment.
LGTM
And I think add_reference_when_tail_expr_of_block should be retained
A4-Tacks
approved these changes
Oct 2, 2026
A4-Tacks
enabled auto-merge
October 2, 2026 13:48
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Oct 2, 2026
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
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.
Fixed #22152