diff options
| author | Ralf Jung <post@ralfj.de> | 2024-03-08 08:08:09 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-03-08 08:08:09 +0100 |
| commit | fcd2efeb1180162091ce8f79087b2cbd56ea0b76 (patch) | |
| tree | 9da59f255a8a2d5451877c60b9b4d48ab5328542 /src | |
| parent | 2ebf9ec5e7a42f9f2360cf0d8eafe4801c4eba56 (diff) | |
| download | rust-fcd2efeb1180162091ce8f79087b2cbd56ea0b76.tar.gz rust-fcd2efeb1180162091ce8f79087b2cbd56ea0b76.zip | |
fix clippy lints
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/src/concurrency/thread.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/eval.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/src/helpers.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/shims/windows/sync.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/miri/src/concurrency/thread.rs b/src/tools/miri/src/concurrency/thread.rs index 8341fd7648b..805c0580b2f 100644 --- a/src/tools/miri/src/concurrency/thread.rs +++ b/src/tools/miri/src/concurrency/thread.rs @@ -890,7 +890,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { instance, start_abi, &[*func_arg], - Some(&ret_place.into()), + Some(&ret_place), StackPopCleanup::Root { cleanup: true }, )?; diff --git a/src/tools/miri/src/eval.rs b/src/tools/miri/src/eval.rs index 4e080f0cc3b..f7edbdb9c5e 100644 --- a/src/tools/miri/src/eval.rs +++ b/src/tools/miri/src/eval.rs @@ -391,7 +391,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( argv, Scalar::from_u8(sigpipe).into(), ], - Some(&ret_place.into()), + Some(&ret_place), StackPopCleanup::Root { cleanup: true }, )?; } @@ -400,7 +400,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( entry_instance, Abi::Rust, &[argc.into(), argv], - Some(&ret_place.into()), + Some(&ret_place), StackPopCleanup::Root { cleanup: true }, )?; } diff --git a/src/tools/miri/src/helpers.rs b/src/tools/miri/src/helpers.rs index 9e609833f07..5e9de3ffb80 100644 --- a/src/tools/miri/src/helpers.rs +++ b/src/tools/miri/src/helpers.rs @@ -401,7 +401,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let mir = this.load_mir(f.def, None)?; let dest = match dest { Some(dest) => dest.clone(), - None => MPlaceTy::fake_alloc_zst(this.layout_of(mir.return_ty())?).into(), + None => MPlaceTy::fake_alloc_zst(this.layout_of(mir.return_ty())?), }; this.push_stack_frame(f, mir, &dest, stack_pop)?; diff --git a/src/tools/miri/src/shims/windows/sync.rs b/src/tools/miri/src/shims/windows/sync.rs index c0a79e959a6..5edc18af482 100644 --- a/src/tools/miri/src/shims/windows/sync.rs +++ b/src/tools/miri/src/shims/windows/sync.rs @@ -179,7 +179,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let id = this.init_once_get_id(init_once_op)?; let flags = this.read_scalar(flags_op)?.to_u32()?; - let pending_place = this.deref_pointer(pending_op)?.into(); + let pending_place = this.deref_pointer(pending_op)?; let context = this.read_pointer(context_op)?; if flags != 0 { |