From 81dc6f978c081db0ba0f44970df699cda94d6110 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Mon, 28 Oct 2024 23:02:41 -0700 Subject: [PATCH] trivial: Fix style Signed-off-by: Nick Spinale --- .../sel4-simple-task/runtime/config/types/src/lib.rs | 6 +++--- .../runtime/config/types/src/zerocopy_helpers.rs | 6 +++--- crates/sel4-shared-ring-buffer/block-io/types/src/lib.rs | 2 +- crates/sel4-shared-ring-buffer/src/descriptor.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/private/support/sel4-simple-task/runtime/config/types/src/lib.rs b/crates/private/support/sel4-simple-task/runtime/config/types/src/lib.rs index a7a6ac792..1cacb6584 100644 --- a/crates/private/support/sel4-simple-task/runtime/config/types/src/lib.rs +++ b/crates/private/support/sel4-simple-task/runtime/config/types/src/lib.rs @@ -31,7 +31,7 @@ pub type Address = NativeWord; pub type CPtrBits = NativeWord; #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable, KnownLayout)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable, KnownLayout)] struct Head { static_heap: ZerocopyOptionWordRange, static_heap_mutex_notification: ZerocopyOptionWord, @@ -42,7 +42,7 @@ struct Head { } #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable)] struct Thread { ipc_buffer_addr: ZerocopyWord, endpoint: ZerocopyOptionWord, @@ -102,7 +102,7 @@ impl<'a> RuntimeConfig<'a> { } #[repr(transparent)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable)] pub struct RuntimeThreadConfig { inner: Thread, } diff --git a/crates/private/support/sel4-simple-task/runtime/config/types/src/zerocopy_helpers.rs b/crates/private/support/sel4-simple-task/runtime/config/types/src/zerocopy_helpers.rs index 1ae27e6fc..484946750 100644 --- a/crates/private/support/sel4-simple-task/runtime/config/types/src/zerocopy_helpers.rs +++ b/crates/private/support/sel4-simple-task/runtime/config/types/src/zerocopy_helpers.rs @@ -47,7 +47,7 @@ impl fmt::Display for InvalidZerocopyOptionTagOr { // #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable, KnownLayout)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable, KnownLayout)] pub struct ZerocopyWordRange { start: ZerocopyWord, end: ZerocopyWord, @@ -93,7 +93,7 @@ impl + Copy> TryFrom<&Range> for ZerocopyWordRange { // #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable, KnownLayout)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable, KnownLayout)] pub struct ZerocopyOptionWord { is_present: u8, value: ZerocopyWord, @@ -156,7 +156,7 @@ impl TryFrom<&ZerocopyOptionWord> for Option { // #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, IntoBytes, FromBytes, Immutable, KnownLayout)] +#[derive(Debug, Clone, PartialEq, Eq, FromBytes, IntoBytes, Immutable, KnownLayout)] pub struct ZerocopyOptionWordRange { is_present: u8, value: ZerocopyWordRange, diff --git a/crates/sel4-shared-ring-buffer/block-io/types/src/lib.rs b/crates/sel4-shared-ring-buffer/block-io/types/src/lib.rs index aca4df6e4..654f83d56 100644 --- a/crates/sel4-shared-ring-buffer/block-io/types/src/lib.rs +++ b/crates/sel4-shared-ring-buffer/block-io/types/src/lib.rs @@ -11,7 +11,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes}; use sel4_shared_ring_buffer::Descriptor; -#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, IntoBytes, FromBytes, Immutable)] +#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, FromBytes, IntoBytes, Immutable)] #[repr(C)] pub struct BlockIORequest { status: i32, diff --git a/crates/sel4-shared-ring-buffer/src/descriptor.rs b/crates/sel4-shared-ring-buffer/src/descriptor.rs index 82e40a63c..eccad42e3 100644 --- a/crates/sel4-shared-ring-buffer/src/descriptor.rs +++ b/crates/sel4-shared-ring-buffer/src/descriptor.rs @@ -9,7 +9,7 @@ use core::ops::Range; use zerocopy::{FromBytes, Immutable, IntoBytes}; #[repr(C)] -#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, IntoBytes, FromBytes, Immutable)] +#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, FromBytes, IntoBytes, Immutable)] pub struct Descriptor { encoded_addr: usize, len: u32,