Skip to content

Commit 3746eb2

Browse files
authored
Merge pull request #22663 from rust-lang/rustc-pull
Rustc pull update
2 parents 095aaff + 21f1cff commit 3746eb2

6 files changed

Lines changed: 7 additions & 1 deletion

File tree

crates/hir-ty/src/infer/callee.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ impl<'db> InferenceContext<'_, 'db> {
173173
// impl forces the closure kind to `FnOnce` i.e. `u8`.
174174
let kind_ty = autoderef.ctx().table.next_ty_var(call_expr.into());
175175
let interner = autoderef.ctx().interner();
176+
177+
// Ignore splatting, it is unsupported on closures.
176178
let call_sig = interner.mk_fn_sig(
177179
[coroutine_closure_sig.tupled_inputs_ty],
178180
coroutine_closure_sig.to_coroutine(

crates/hir-ty/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ pub fn callable_sig_from_fn_trait<'db>(
464464
args.tuple_fields(),
465465
ret,
466466
false,
467+
// FIXME(splat): handle splatted arguments
467468
Safety::Safe,
468469
ExternAbi::Rust,
469470
));

crates/hir-ty/src/lower.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {
637637
fn_.abi,
638638
if fn_.is_unsafe { Safety::Unsafe } else { Safety::Safe },
639639
fn_.is_varargs,
640+
// FIXME(splat): handle splatted arguments
640641
),
641642
inputs_and_output: Tys::new_from_slice(&args),
642643
}),

crates/hir-ty/src/next_solver/interner.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,6 +2238,7 @@ impl<'db> DbInterner<'db> {
22382238
self.replace_escaping_bound_vars_uncached(value.skip_binder(), delegate)
22392239
}
22402240

2241+
// FIXME: add splat support when the experiment is complete
22412242
pub fn mk_fn_sig<I>(
22422243
self,
22432244
inputs: I,

crates/hir-ty/src/next_solver/ty.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@ impl<'db> DbInterner<'db> {
15141514
TyKind::Tuple(params) => params,
15151515
_ => panic!(),
15161516
};
1517+
// Ignore splatting, it is unsupported on closures.
15171518
self.mk_fn_sig(params, s.output(), s.c_variadic(), safety, ExternAbi::Rust)
15181519
})
15191520
}

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
942ac9ce4116d4ea784c9882659372b34978b1f8
1+
7fb284d9037fa54f6a9b24261c82b394472cbfd7

0 commit comments

Comments
 (0)