Skip to content

Commit fcd2efe

Browse files
committed
fix clippy lints
1 parent 2ebf9ec commit fcd2efe

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/tools/miri/src/concurrency/thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
890890
instance,
891891
start_abi,
892892
&[*func_arg],
893-
Some(&ret_place.into()),
893+
Some(&ret_place),
894894
StackPopCleanup::Root { cleanup: true },
895895
)?;
896896

src/tools/miri/src/eval.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
391391
argv,
392392
Scalar::from_u8(sigpipe).into(),
393393
],
394-
Some(&ret_place.into()),
394+
Some(&ret_place),
395395
StackPopCleanup::Root { cleanup: true },
396396
)?;
397397
}
@@ -400,7 +400,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
400400
entry_instance,
401401
Abi::Rust,
402402
&[argc.into(), argv],
403-
Some(&ret_place.into()),
403+
Some(&ret_place),
404404
StackPopCleanup::Root { cleanup: true },
405405
)?;
406406
}

src/tools/miri/src/helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
401401
let mir = this.load_mir(f.def, None)?;
402402
let dest = match dest {
403403
Some(dest) => dest.clone(),
404-
None => MPlaceTy::fake_alloc_zst(this.layout_of(mir.return_ty())?).into(),
404+
None => MPlaceTy::fake_alloc_zst(this.layout_of(mir.return_ty())?),
405405
};
406406
this.push_stack_frame(f, mir, &dest, stack_pop)?;
407407

src/tools/miri/src/shims/windows/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
179179

180180
let id = this.init_once_get_id(init_once_op)?;
181181
let flags = this.read_scalar(flags_op)?.to_u32()?;
182-
let pending_place = this.deref_pointer(pending_op)?.into();
182+
let pending_place = this.deref_pointer(pending_op)?;
183183
let context = this.read_pointer(context_op)?;
184184

185185
if flags != 0 {

0 commit comments

Comments
 (0)