OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #67004 - estebank:issue-66958, r=eddyb 

Do not ICE on async fn with non-Copy infered type arg

Fix #66958.
This commit is contained in:
bors 2019-12-09 05:16:48 +00:00
parent 2b0e6d2643 7ed9066766
commit dbbe4f10fa
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
View File

@ -240,15 +240,16 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
let tcx = self.infcx.tcx;
let generics = tcx.generics_of(self.mir_def_id);
let param = generics.type_param(&param_ty, tcx);
let generics = tcx.hir().get_generics(self.mir_def_id).unwrap();
suggest_constraining_type_param(
generics,
&mut err,
&param.name.as_str(),
"Copy",
tcx.sess.source_map(),
span,
);
if let Some(generics) = tcx.hir().get_generics(self.mir_def_id) {
suggest_constraining_type_param(
generics,
&mut err,
&param.name.as_str(),
"Copy",
tcx.sess.source_map(),
span,
);
}
}
let span = if let Some(local) = place.as_local() {
let decl = &self.body.local_decls[local];

15
src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.rs Normal file
View File

@ -0,0 +1,15 @@
// edition:2018
struct Ia<S>(S);
impl<S> Ia<S> {
fn partial(_: S) {}
fn full(self) {}
async fn crash(self) {
Self::partial(self.0);
Self::full(self); //~ ERROR use of moved value: `self`
}
}
fn main() {}

13
src/test/ui/async-await/issues/issue-66958-non-copy-infered-type-arg.stderr Normal file
View File

@ -0,0 +1,13 @@
error[E0382]: use of moved value: `self`
--> $DIR/issue-66958-non-copy-infered-type-arg.rs:11:20
|
LL | Self::partial(self.0);
| ------ value moved here
LL | Self::full(self);
| ^^^^ value used here after partial move
|
= note: move occurs because `self.0` has type `S`, which does not implement the `Copy` trait
error: aborting due to previous error
For more information about this error, try `rustc --explain E0382`.