Auto merge of #88650 - sapessi:issue-77175-fix, r=estebank
Skip single use lifetime lint for generated opaque types Fix: #77175 The opaque type generated by the desugaring process of an async function uses the lifetimes defined by the originating function. The DefId for the lifetimes in the opaque type are different from the ones in the originating async function - as they should be, as far as I understand, and could therefore be considered a single use lifetimes, this causes the single_use_lifetimes lint to fail compilation if explicitly denied. This fix skips the lint for lifetimes used only once in generated opaque types for an async function that are declared in the parent async function definition. More info in the comments on the original issue: 1 and 2
This commit is contained in:
commit
23afad6e7f
@ -2024,7 +2024,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
|
||||
// ensure that we issue lints in a repeatable order
|
||||
def_ids.sort_by_cached_key(|&def_id| self.tcx.def_path_hash(def_id));
|
||||
|
||||
for def_id in def_ids {
|
||||
'lifetimes: for def_id in def_ids {
|
||||
debug!("check_uses_for_lifetimes_defined_by_scope: def_id = {:?}", def_id);
|
||||
|
||||
let lifetimeuseset = self.lifetime_uses.remove(&def_id);
|
||||
@ -2067,6 +2067,27 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// opaque types generated when desugaring an async function can have a single
|
||||
// use lifetime even if it is explicitly denied (Issue #77175)
|
||||
if let hir::Node::Item(hir::Item {
|
||||
kind: hir::ItemKind::OpaqueTy(ref opaque),
|
||||
..
|
||||
}) = self.tcx.hir().get(parent_hir_id)
|
||||
{
|
||||
if opaque.origin != hir::OpaqueTyOrigin::AsyncFn {
|
||||
continue 'lifetimes;
|
||||
}
|
||||
// We want to do this only if the liftime identifier is already defined
|
||||
// in the async function that generated this. Otherwise it could be
|
||||
// an opaque type defined by the developer and we still want this
|
||||
// lint to fail compilation
|
||||
for p in opaque.generics.params {
|
||||
if defined_by.contains_key(&p.name) {
|
||||
continue 'lifetimes;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
19
src/test/ui/lifetimes/issue-77175.rs
Normal file
19
src/test/ui/lifetimes/issue-77175.rs
Normal file
@ -0,0 +1,19 @@
|
||||
#[deny(single_use_lifetimes)]
|
||||
// edition:2018
|
||||
// check-pass
|
||||
|
||||
// Prior to the fix, the compiler complained that the 'a lifetime was only used
|
||||
// once. This was obviously wrong since the lifetime is used twice: For the s3
|
||||
// parameter and the return type. The issue was caused by the compiler
|
||||
// desugaring the async function into a generator that uses only a single
|
||||
// lifetime, which then the validator complained about becauase of the
|
||||
// single_use_lifetimes constraints.
|
||||
async fn bar<'a>(s1: String, s2: &'_ str, s3: &'a str) -> &'a str {
|
||||
s3
|
||||
}
|
||||
|
||||
fn foo<'a>(s1: String, s2: &'_ str, s3: &'a str) -> &'a str {
|
||||
s3
|
||||
}
|
||||
|
||||
fn main() {}
|
Loading…
x
Reference in New Issue
Block a user