Skip to content

Commit 12d04ac

Browse files
committed
make clippy happy
1 parent af39709 commit 12d04ac

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/concurrency/data_race.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ impl VClockAlloc {
964964
let (index, clocks) = global.current_thread_state();
965965
let mut alloc_ranges = self.alloc_ranges.borrow_mut();
966966
for (offset, range) in alloc_ranges.iter_mut(range.start, range.size) {
967-
if let Err(DataRace) = range.read_race_detect(&*clocks, index) {
967+
if let Err(DataRace) = range.read_race_detect(&clocks, index) {
968968
// Report data-race.
969969
return Self::report_data_race(
970970
global,
@@ -992,7 +992,7 @@ impl VClockAlloc {
992992
if global.race_detecting() {
993993
let (index, clocks) = global.current_thread_state();
994994
for (offset, range) in self.alloc_ranges.get_mut().iter_mut(range.start, range.size) {
995-
if let Err(DataRace) = range.write_race_detect(&*clocks, index, write_type) {
995+
if let Err(DataRace) = range.write_race_detect(&clocks, index, write_type) {
996996
// Report data-race
997997
return Self::report_data_race(
998998
global,
@@ -1072,7 +1072,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {
10721072
for (offset, range) in
10731073
alloc_meta.alloc_ranges.borrow_mut().iter_mut(base_offset, size)
10741074
{
1075-
if let Err(DataRace) = op(range, &mut *clocks, index, atomic) {
1075+
if let Err(DataRace) = op(range, &mut clocks, index, atomic) {
10761076
mem::drop(clocks);
10771077
return VClockAlloc::report_data_race(
10781078
data_race,

src/eval.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
215215
let arg_place =
216216
ecx.allocate(ecx.layout_of(arg_type)?, MiriMemoryKind::Machine.into())?;
217217
ecx.write_os_str_to_c_str(OsStr::new(arg), arg_place.ptr, size)?;
218-
ecx.mark_immutable(&*arg_place);
218+
ecx.mark_immutable(&arg_place);
219219
argvs.push(arg_place.to_ref(&ecx));
220220
}
221221
// Make an array with all these pointers, in the Miri memory.
@@ -227,23 +227,23 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
227227
let place = ecx.mplace_field(&argvs_place, idx)?;
228228
ecx.write_immediate(arg, &place.into())?;
229229
}
230-
ecx.mark_immutable(&*argvs_place);
230+
ecx.mark_immutable(&argvs_place);
231231
// A pointer to that place is the 3rd argument for main.
232232
let argv = argvs_place.to_ref(&ecx);
233233
// Store `argc` and `argv` for macOS `_NSGetArg{c,v}`.
234234
{
235235
let argc_place =
236236
ecx.allocate(ecx.machine.layouts.isize, MiriMemoryKind::Machine.into())?;
237237
ecx.write_scalar(argc, &argc_place.into())?;
238-
ecx.mark_immutable(&*argc_place);
238+
ecx.mark_immutable(&argc_place);
239239
ecx.machine.argc = Some(*argc_place);
240240

241241
let argv_place = ecx.allocate(
242242
ecx.layout_of(tcx.mk_imm_ptr(tcx.types.unit))?,
243243
MiriMemoryKind::Machine.into(),
244244
)?;
245245
ecx.write_immediate(argv, &argv_place.into())?;
246-
ecx.mark_immutable(&*argv_place);
246+
ecx.mark_immutable(&argv_place);
247247
ecx.machine.argv = Some(*argv_place);
248248
}
249249
// Store command line as UTF-16 for Windows `GetCommandLineW`.
@@ -260,7 +260,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
260260
let place = ecx.mplace_field(&cmd_place, idx)?;
261261
ecx.write_scalar(Scalar::from_u16(c), &place.into())?;
262262
}
263-
ecx.mark_immutable(&*cmd_place);
263+
ecx.mark_immutable(&cmd_place);
264264
}
265265
argv
266266
};

src/stacked_borrows.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
928928
orig_tag,
929929
item,
930930
(alloc_id, range, offset),
931-
&mut *global,
931+
&mut global,
932932
current_span,
933933
history,
934934
exposed_tags,
@@ -1090,7 +1090,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
10901090

10911091
#[inline(always)]
10921092
fn ecx(&mut self) -> &mut MiriEvalContext<'mir, 'tcx> {
1093-
&mut self.ecx
1093+
self.ecx
10941094
}
10951095

10961096
fn visit_value(&mut self, place: &MPlaceTy<'tcx, Tag>) -> InterpResult<'tcx> {

0 commit comments

Comments
 (0)