diff --git a/xous-rs/src/arch/hosted/process.rs b/xous-rs/src/arch/hosted/process.rs index 66cd3e5a5..04a1e9f9c 100644 --- a/xous-rs/src/arch/hosted/process.rs +++ b/xous-rs/src/arch/hosted/process.rs @@ -53,13 +53,13 @@ impl ProcessArgs { } } -impl Into<[usize; 7]> for &ProcessInit { - fn into(self) -> [usize; 7] { +impl From<&ProcessInit> for [usize; 7] { + fn from(init: &ProcessInit) -> [usize; 7] { [ - u32::from_le_bytes(self.key.0[0..4].try_into().unwrap()) as _, - u32::from_le_bytes(self.key.0[4..8].try_into().unwrap()) as _, - u32::from_le_bytes(self.key.0[8..12].try_into().unwrap()) as _, - u32::from_le_bytes(self.key.0[12..16].try_into().unwrap()) as _, + u32::from_le_bytes(init.key.0[0..4].try_into().unwrap()) as _, + u32::from_le_bytes(init.key.0[4..8].try_into().unwrap()) as _, + u32::from_le_bytes(init.key.0[8..12].try_into().unwrap()) as _, + u32::from_le_bytes(init.key.0[12..16].try_into().unwrap()) as _, 0, 0, 0, @@ -120,9 +120,9 @@ impl From<[usize; 8]> for ProcessStartup { } } -impl Into<[usize; 7]> for &ProcessStartup { - fn into(self) -> [usize; 7] { - [self.pid.get() as _, 0, 0, 0, 0, 0, 0] +impl From<&ProcessStartup> for [usize; 7] { + fn from(startup: &ProcessStartup) -> [usize; 7] { + [startup.pid.get() as _, 0, 0, 0, 0, 0, 0] } } diff --git a/xous-rs/src/arch/riscv/process.rs b/xous-rs/src/arch/riscv/process.rs index 9e9b6aae8..0d8769e00 100644 --- a/xous-rs/src/arch/riscv/process.rs +++ b/xous-rs/src/arch/riscv/process.rs @@ -52,7 +52,7 @@ pub struct ProcessInit { // 6 } -impl Into<[usize; 7]> for &ProcessInit { +impl From<&ProcessInit> for [usize; 7] { fn into(self) -> [usize; 7] { [ self.stack.addr.get(), @@ -121,7 +121,7 @@ impl From<[usize; 8]> for ProcessStartup { } } -impl Into<[usize; 7]> for &ProcessStartup { +impl From<&ProcessStartup> for [usize; 7] { fn into(self) -> [usize; 7] { [self.pid.get() as _, self.connection as _, 0, 0, 0, 0, 0] } diff --git a/xous-rs/src/arch/test/mod.rs b/xous-rs/src/arch/test/mod.rs index 4450eddab..ec13bb75e 100644 --- a/xous-rs/src/arch/test/mod.rs +++ b/xous-rs/src/arch/test/mod.rs @@ -20,13 +20,13 @@ impl ProcessKey { } } -impl Into for ProcessKey { - fn into(self) -> String { - let mut out = String::new(); +impl core::fmt::Display for ProcessKey { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { for i in self.0 { - out.push_str(&format!("{:02x}", i)); + write!(f, "{:02x}", i)?; } - out + + Ok(()) } } @@ -184,14 +184,14 @@ impl From<[usize; 8]> for ProcessStartup { } } -impl Into<[usize; 7]> for &ProcessStartup { - fn into(self) -> [usize; 7] { - [self.pid.get() as _, 0, 0, 0, 0, 0, 0] +impl From<&ProcessStartup> for [usize; 7] { + fn from(startup: &ProcessStartup) -> [usize; 7] { + [startup.pid.get() as _, 0, 0, 0, 0, 0, 0] } } -impl Into<[usize; 7]> for &ProcessInit { - fn into(self) -> [usize; 7] { +impl From<&ProcessInit> for [usize; 7] { + fn from(init: &ProcessInit) -> [usize; 7] { [ u32::from_le_bytes(self.key.0[0..4].try_into().unwrap()) as _, u32::from_le_bytes(self.key.0[4..8].try_into().unwrap()) as _,