Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix up autoderef when reborrowing #72280

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

Merged
merged 7 commits into from
Jun 19, 2020
Merged

Fix up autoderef when reborrowing #72280

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5393a29
Move convert_place_derefs_to_mutable out from check/method/confirm.rs
nbdd0121 May 16, 2020
fb0793c
Add some comments to librustc_typeck/check/callee.rs
nbdd0121 Jun 14, 2020
8121d2e
Fix up autoderef when performing mutable auto borrow
nbdd0121 Jun 14, 2020
4710f85
Add ui tests for issue 68590 and 72225
nbdd0121 Jun 14, 2020
e390acd
Use expr_ty_adjusted in convert_place_op_to_mutable
nbdd0121 Jun 15, 2020
5cedf5d
Refactor usage of Needs in typeck
nbdd0121 Jun 15, 2020
2b7d858
Add some comments related to place op typeck
nbdd0121 Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use expr_ty_adjusted in convert_place_op_to_mutable
  • Loading branch information
@nbdd0121
nbdd0121 committed Jun 15, 2020
commit e390acdfccdc5297e8fbb186bbb890cb6a3d0e57
13 changes: 5 additions & 8 deletions src/librustc_typeck/check/reconciliation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return;
}

// Need to deref because overloaded place ops take self by-reference.
let base_ty = self
.tables
.borrow()
.expr_adjustments(base_expr)
.last()
.map_or_else(|| self.node_ty(expr.hir_id), |adj| adj.target);
let base_ty = self.resolve_vars_if_possible(&base_ty);

// Need to deref because overloaded place ops take self by-reference.
let base_ty =
base_ty.builtin_deref(false).expect("place op takes something that is not a ref").ty;
.expr_ty_adjusted(base_expr)
.builtin_deref(false)
.expect("place op takes something that is not a ref")
.ty;

let method = self.try_overloaded_place_op(expr.span, base_ty, arg_tys, Needs::MutPlace, op);
let method = match method {
Expand Down