Skip to content

Also erase substs for new infcx in pin move error #107422

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.

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 1 commit into from
Jan 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions compiler/rustc_borrowck/src/diagnostics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1128,8 +1128,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
"{place_name} {partially_str}moved due to this method call{loop_message}",
),
);

let infcx = tcx.infer_ctxt().build();
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we even create a new infcx here instead of using self.infcx?

Copy link
Member

Choose a reason for hiding this comment

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

Regions already solve so can_eq ices

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

remember that someone told me the reason behind this before and I forgot 😅

might be nice to add a comment about this here, but apart from that this does feel like a pretty good solution 🤔

// Erase and shadow everything that could be passed to the new infcx.
let ty = tcx.erase_regions(moved_place.ty(self.body, tcx).ty);
let method_substs = tcx.erase_regions(method_substs);

if let ty::Adt(def, substs) = ty.kind()
&& Some(def.did()) == tcx.lang_items().pin_type()
&& let ty::Ref(_, _, hir::Mutability::Mut) = substs.type_at(0).kind()
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/moves/pin-mut-reborrow-infer-var-issue-107419.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// run-rustfix
use std::pin::Pin;

fn foo(_: &mut ()) {}

fn main() {
let mut uwu = ();
let mut r = Pin::new(&mut uwu);
foo(r.as_mut().get_mut());
foo(r.get_mut()); //~ ERROR use of moved value
}
11 changes: 11 additions & 0 deletions tests/ui/moves/pin-mut-reborrow-infer-var-issue-107419.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// run-rustfix
use std::pin::Pin;

fn foo(_: &mut ()) {}

fn main() {
let mut uwu = ();
let mut r = Pin::new(&mut uwu);
foo(r.get_mut());
foo(r.get_mut()); //~ ERROR use of moved value
}
20 changes: 20 additions & 0 deletions tests/ui/moves/pin-mut-reborrow-infer-var-issue-107419.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0382]: use of moved value: `r`
--> $DIR/pin-mut-reborrow-infer-var-issue-107419.rs:10:9
|
LL | let mut r = Pin::new(&mut uwu);
| ----- move occurs because `r` has type `Pin<&mut ()>`, which does not implement the `Copy` trait
LL | foo(r.get_mut());
| --------- `r` moved due to this method call
LL | foo(r.get_mut());
| ^ value used here after move
|
note: `Pin::<&'a mut T>::get_mut` takes ownership of the receiver `self`, which moves `r`
--> $SRC_DIR/core/src/pin.rs:LL:COL
help: consider reborrowing the `Pin` instead of moving it
|
LL | foo(r.as_mut().get_mut());
| +++++++++

error: aborting due to previous error

For more information about this error, try `rustc --explain E0382`.