Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22938 from edragain2nd/fix/hrtb_closure
fix: avoid panic when checking Copy for hrtb closure arguments
| -rw-r--r-- | crates/hir-ty/src/mir/lower.rs | 6 | ||||
| -rw-r--r-- | crates/hir-ty/src/mir/lower/tests.rs | 28 |
2 files changed, 30 insertions, 4 deletions
diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs index 1c7e5c2f51..620d768cff 100644 --- a/crates/hir-ty/src/mir/lower.rs +++ b/crates/hir-ty/src/mir/lower.rs @@ -53,7 +53,6 @@ use crate::{ next_solver::{ Const, DbInterner, ParamConst, ParamEnv, Region, StoredGenericArgs, StoredTy, TyKind, TypingMode, UnevaluatedConst, - abi::Safety, infer::{DbInternerInferExt, InferCtxt}, }, }; @@ -2147,11 +2146,10 @@ pub fn mir_body_for_closure_query<'db>( .store(), }); ctx.result.param_locals.push(closure_local); - - let sig = ctx.interner().signature_unclosure(substs.as_closure().sig(), Safety::Safe); + let sig = infer.closures_data[&expr].liberated_sig.get(); let resolver_guard = ctx.resolver.update_to_inner_scope(db, ctx.store_owner, expr); let current = ctx.lower_params_and_bindings( - args.iter().zip(sig.skip_binder().inputs().iter()).map(|(it, y)| (*it, *y)), + args.iter().zip(sig.inputs().iter()).map(|(it, y)| (*it, *y)), None, |_| true, )?; diff --git a/crates/hir-ty/src/mir/lower/tests.rs b/crates/hir-ty/src/mir/lower/tests.rs index 8eb0a02694..fdd67fc4fb 100644 --- a/crates/hir-ty/src/mir/lower/tests.rs +++ b/crates/hir-ty/src/mir/lower/tests.rs @@ -150,3 +150,31 @@ fn caller(path: &PathBuf) { "#, ); } + +#[test] +fn borrowck_hrtb_closure_argument_does_not_panic() { + check_borrowck( + r#" +//- minicore: fn, copy +enum Res<T, E> { + Ok(T), + Err(E), +} + +struct S; + +impl S { + fn set<F>(&mut self, _: F) + where + F: for<'a> Fn(&mut (), &'a [u8]) -> Res<(), ()>, + { + } +} + +fn main() { + let mut s = S; + s.set(|_, _| Res::Err(())); +} + "#, + ); +} |