bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #110823 - compiler-errors:tweak-await-span, r=b-naber

Browse source 
Tweak await span to not contain dot

Fixes a discrepancy between method calls and await expressions where the latter are desugared to have a span that *contains* the dot (i.e. `.await`) but method call identifiers don't contain the dot. This leads to weird suggestions suggestions in borrowck -- see linked issue.

Fixes #110761

This mostly touches a bunch of tests to tighten their `await` span.
This commit is contained in:
Matthias Krüger 2023-05-01 01:09:47 +02:00 • committed by GitHub
commit 1b262b8b56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 594 additions and 807 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_middle/src/util/call_kind.rs
View file

@ -19,6 +19,8 @@ pub enum CallDesugaringKind {
QuestionFromResidual,
/// try { ..; x } calls type_of(x)::from_output(x)
TryBlockFromOutput,
/// `.await` calls `IntoFuture::into_future`
Await,
}
impl CallDesugaringKind {
@ -29,6 +31,7 @@ impl CallDesugaringKind {
tcx.require_lang_item(LangItem::Try, None)
}
Self::QuestionFromResidual => tcx.get_diagnostic_item(sym::FromResidual).unwrap(),
Self::Await => tcx.get_diagnostic_item(sym::IntoFuture).unwrap(),
}
}
}
@ -129,6 +132,8 @@ pub fn call_kind<'tcx>(
&& fn_call_span.desugaring_kind() == Some(DesugaringKind::TryBlock)
{
Some((CallDesugaringKind::TryBlockFromOutput, method_substs.type_at(0)))
} else if fn_call_span.is_desugaring(DesugaringKind::Await) {
Some((CallDesugaringKind::Await, method_substs.type_at(0)))
} else {
None
};