Skip to content

Commit 84f70ab

Browse files
RalfJungRalfJung
committed
fmt
1 parent 8058933 commit 84f70ab

File tree

12 files changed

+16
-54
lines changed

12 files changed

+16
-54
lines changed

‎src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ impl<'ecx, 'tcx> DiagnosticCxBuilder<'ecx, 'tcx> {
149149
DiagnosticCxBuilder { machine, operation }
150150
}
151151

152-
pub fn read(
153-
machine: &'ecx MiriMachine<'tcx>,
154-
tag: ProvenanceExtra,
155-
range: AllocRange,
156-
) -> Self {
152+
pub fn read(machine: &'ecx MiriMachine<'tcx>, tag: ProvenanceExtra, range: AllocRange) -> Self {
157153
let operation = Operation::Access(AccessOp { kind: AccessKind::Read, tag, range });
158154
DiagnosticCxBuilder { machine, operation }
159155
}

‎src/tools/miri/src/concurrency/init_once.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
3333
#[inline]
3434
fn init_once_get_or_create<F>(&mut self, existing: F) -> InterpResult<'tcx, InitOnceId>
3535
where
36-
F: FnOnce(
37-
&mut MiriInterpCx<'tcx>,
38-
InitOnceId,
39-
) -> InterpResult<'tcx, Option<InitOnceId>>,
36+
F: FnOnce(&mut MiriInterpCx<'tcx>, InitOnceId) -> InterpResult<'tcx, Option<InitOnceId>>,
4037
{
4138
let this = self.eval_context_mut();
4239
let next_index = this.machine.sync.init_onces.next_index();

‎src/tools/miri/src/concurrency/sync.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,7 @@ pub struct SynchronizationObjects {
161161

162162
// Private extension trait for local helper methods
163163
impl<'tcx> EvalContextExtPriv<'tcx> for crate::MiriInterpCx<'tcx> {}
164-
pub(super) trait EvalContextExtPriv<'tcx>:
165-
crate::MiriInterpCxExt<'tcx>
166-
{
164+
pub(super) trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
167165
/// Lazily initialize the ID of this Miri sync structure.
168166
/// ('0' indicates uninit.)
169167
#[inline]
@@ -245,10 +243,7 @@ pub(super) trait EvalContextExtPriv<'tcx>:
245243
#[inline]
246244
fn condvar_get_or_create<F>(&mut self, existing: F) -> InterpResult<'tcx, CondvarId>
247245
where
248-
F: FnOnce(
249-
&mut MiriInterpCx<'tcx>,
250-
CondvarId,
251-
) -> InterpResult<'tcx, Option<CondvarId>>,
246+
F: FnOnce(&mut MiriInterpCx<'tcx>, CondvarId) -> InterpResult<'tcx, Option<CondvarId>>,
252247
{
253248
let this = self.eval_context_mut();
254249
let next_index = this.machine.sync.condvars.next_index();

‎src/tools/miri/src/shims/unix/sync.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ use crate::*;
1010
// - kind: i32
1111

1212
#[inline]
13-
fn mutexattr_kind_offset<'tcx>(
14-
ecx: &MiriInterpCx<'tcx>,
15-
) -> InterpResult<'tcx, u64> {
13+
fn mutexattr_kind_offset<'tcx>(ecx: &MiriInterpCx<'tcx>) -> InterpResult<'tcx, u64> {
1614
Ok(match &*ecx.tcx.sess.target.os {
1715
"linux" | "illumos" | "solaris" | "macos" => 0,
1816
os => throw_unsup_format!("`pthread_mutexattr` is not supported on {os}"),
@@ -53,17 +51,11 @@ fn mutexattr_set_kind<'tcx>(
5351
/// in `pthread_mutexattr_settype` function.
5452
const PTHREAD_MUTEX_NORMAL_FLAG: i32 = 0x8000000;
5553

56-
fn is_mutex_kind_default<'tcx>(
57-
ecx: &MiriInterpCx<'tcx>,
58-
kind: i32,
59-
) -> InterpResult<'tcx, bool> {
54+
fn is_mutex_kind_default<'tcx>(ecx: &MiriInterpCx<'tcx>, kind: i32) -> InterpResult<'tcx, bool> {
6055
Ok(kind == ecx.eval_libc_i32("PTHREAD_MUTEX_DEFAULT"))
6156
}
6257

63-
fn is_mutex_kind_normal<'tcx>(
64-
ecx: &MiriInterpCx<'tcx>,
65-
kind: i32,
66-
) -> InterpResult<'tcx, bool> {
58+
fn is_mutex_kind_normal<'tcx>(ecx: &MiriInterpCx<'tcx>, kind: i32) -> InterpResult<'tcx, bool> {
6759
let mutex_normal_kind = ecx.eval_libc_i32("PTHREAD_MUTEX_NORMAL");
6860
Ok(kind == (mutex_normal_kind | PTHREAD_MUTEX_NORMAL_FLAG))
6961
}
@@ -220,9 +212,7 @@ fn rwlock_get_id<'tcx>(
220212
// - clock: i32
221213

222214
#[inline]
223-
fn condattr_clock_offset<'tcx>(
224-
ecx: &MiriInterpCx<'tcx>,
225-
) -> InterpResult<'tcx, u64> {
215+
fn condattr_clock_offset<'tcx>(ecx: &MiriInterpCx<'tcx>) -> InterpResult<'tcx, u64> {
226216
Ok(match &*ecx.tcx.sess.target.os {
227217
"linux" | "illumos" | "solaris" => 0,
228218
// macOS does not have a clock attribute.

‎src/tools/miri/src/shims/x86/aesni.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use rustc_target::spec::abi::Abi;
66
use crate::*;
77

88
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
9-
pub(super) trait EvalContextExt<'tcx>:
10-
crate::MiriInterpCxExt<'tcx>
11-
{
9+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1210
fn emulate_x86_aesni_intrinsic(
1311
&mut self,
1412
link_name: Symbol,

‎src/tools/miri/src/shims/x86/avx.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ use super::{
1313
use crate::*;
1414

1515
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
16-
pub(super) trait EvalContextExt<'tcx>:
17-
crate::MiriInterpCxExt<'tcx>
18-
{
16+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1917
fn emulate_x86_avx_intrinsic(
2018
&mut self,
2119
link_name: Symbol,

‎src/tools/miri/src/shims/x86/avx2.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ use super::{
1111
use crate::*;
1212

1313
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
14-
pub(super) trait EvalContextExt<'tcx>:
15-
crate::MiriInterpCxExt<'tcx>
16-
{
14+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1715
fn emulate_x86_avx2_intrinsic(
1816
&mut self,
1917
link_name: Symbol,

‎src/tools/miri/src/shims/x86/sse.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ use super::{
1010
use crate::*;
1111

1212
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
13-
pub(super) trait EvalContextExt<'tcx>:
14-
crate::MiriInterpCxExt<'tcx>
15-
{
13+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1614
fn emulate_x86_sse_intrinsic(
1715
&mut self,
1816
link_name: Symbol,

‎src/tools/miri/src/shims/x86/sse2.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ use super::{
99
use crate::*;
1010

1111
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
12-
pub(super) trait EvalContextExt<'tcx>:
13-
crate::MiriInterpCxExt<'tcx>
14-
{
12+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1513
fn emulate_x86_sse2_intrinsic(
1614
&mut self,
1715
link_name: Symbol,

‎src/tools/miri/src/shims/x86/sse3.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use super::horizontal_bin_op;
66
use crate::*;
77

88
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
9-
pub(super) trait EvalContextExt<'tcx>:
10-
crate::MiriInterpCxExt<'tcx>
11-
{
9+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1210
fn emulate_x86_sse3_intrinsic(
1311
&mut self,
1412
link_name: Symbol,

‎src/tools/miri/src/shims/x86/sse41.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ use super::{conditional_dot_product, mpsadbw, packusdw, round_all, round_first,
55
use crate::*;
66

77
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
8-
pub(super) trait EvalContextExt<'tcx>:
9-
crate::MiriInterpCxExt<'tcx>
10-
{
8+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
119
fn emulate_x86_sse41_intrinsic(
1210
&mut self,
1311
link_name: Symbol,

‎src/tools/miri/src/shims/x86/ssse3.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use super::{horizontal_bin_op, int_abs, pmulhrsw, psign};
66
use crate::*;
77

88
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
9-
pub(super) trait EvalContextExt<'tcx>:
10-
crate::MiriInterpCxExt<'tcx>
11-
{
9+
pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1210
fn emulate_x86_ssse3_intrinsic(
1311
&mut self,
1412
link_name: Symbol,

0 commit comments

Comments
 (0)