Skip to content

Commit 4072dbb

Browse files
committed
Add splat to clippy, miri, fixme to r-a
1 parent d07b805 commit 4072dbb

6 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/tools/clippy/clippy_lints/src/eta_reduction.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ fn check_closure<'tcx>(cx: &LateContext<'tcx>, outer_receiver: Option<&Expr<'tcx
173173
&& let output = typeck.expr_ty(body.value)
174174
&& let ty::Tuple(tys) = *subs.type_at(1).kind()
175175
{
176-
cx.tcx.mk_fn_sig(tys, output, false, Safety::Safe, ExternAbi::Rust)
176+
cx.tcx
177+
.mk_fn_sig(tys, output, false, false, Safety::Safe, ExternAbi::Rust)
177178
} else {
178179
return;
179180
}

src/tools/miri/src/bin/miri.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ fn entry_fn(tcx: TyCtxt<'_>) -> (DefId, MiriEntryFnType) {
102102
[tcx.types.isize, Ty::new_imm_ptr(tcx, Ty::new_imm_ptr(tcx, tcx.types.u8))],
103103
tcx.types.isize,
104104
false,
105+
false,
105106
hir::Safety::Safe,
106107
ExternAbi::Rust,
107108
));

src/tools/miri/src/helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
409409
args.iter().map(|a| a.layout.ty),
410410
dest.layout.ty,
411411
/*c_variadic*/ false,
412+
/*splatted*/ false,
412413
Safety::Safe,
413414
caller_abi,
414415
);

src/tools/miri/src/shims/sig.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
276276
let fn_sig_binder = Binder::dummy(FnSig {
277277
inputs_and_output: this.machine.tcx.mk_type_list(&inputs_and_output),
278278
c_variadic: false,
279+
splatted: false,
279280
// This does not matter for the ABI.
280281
safety: Safety::Safe,
281282
abi: shim_sig.abi,

src/tools/rust-analyzer/crates/hir-ty/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ pub fn callable_sig_from_fn_trait<'db>(
584584
Binder::dummy(FnSig {
585585
inputs_and_output,
586586
c_variadic: false,
587+
// FIXME(splat): handle splatted arguments
587588
safety: abi::Safety::Safe,
588589
abi: FnAbi::RustCall,
589590
}),

src/tools/rust-analyzer/crates/hir-ty/src/lower.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {
513513
abi: fn_.abi.as_ref().map_or(FnAbi::Rust, FnAbi::from_symbol),
514514
safety: if fn_.is_unsafe { Safety::Unsafe } else { Safety::Safe },
515515
c_variadic: fn_.is_varargs,
516+
// FIXME(splat): handle splatted arguments
516517
inputs_and_output: Tys::new_from_slice(&args),
517518
}),
518519
)

0 commit comments

Comments
 (0)