bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix location of error message explanation

Browse source
This commit is contained in:
1000teslas 2021-01-03 03:53:50 +11:00
parent 5ccef56456
commit 12f1795743
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_mir/src/borrow_check/diagnostics/conflict_errors.rs
View file

@ -1323,16 +1323,6 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
suggestion,
Applicability::MachineApplicable,
);
if let Some(generator_kind) = use_span.generator_kind() {
if let GeneratorKind::Async(_) = generator_kind {
err.note(
"borrows cannot be held across a yield point, because the stack space of the current \
function is not preserved",
);
err.help("see https://rust-lang.github.io/async-book/03_async_await/01_chapter.html#awaiting-on-a-multithreaded-executor \
for more information");
}
}
let msg = match category {
ConstraintCategory::Return(_) | ConstraintCategory::OpaqueType => {
@ -1349,6 +1339,18 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
),
};
err.span_note(constraint_span, &msg);
if let ConstraintCategory::CallArgument = category {
if let Some(generator_kind) = use_span.generator_kind() {
if let GeneratorKind::Async(_) = generator_kind {
err.note(
"borrows cannot be held across a yield point, because the stack \
space of the current function is not preserved",
);
err.help("see https://rust-lang.github.io/async-book/03_async_await/01_chapter.html#awaiting-on-a-multithreaded-executor \
for more information");
}
}
}
err
}