From 72a560b324a6398d73b7b8cc5beb250f8ad000d6 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 8 Oct 2024 09:23:36 -0400 Subject: [PATCH] Change error name to avoid hiffy conflict The name `SprotError` is already used in hubris. This is technically fine but is causing some conflicts with our other tooling. Change the name to avoid conflicts. --- attest-data/Cargo.toml | 2 +- attest-data/src/messages.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/attest-data/Cargo.toml b/attest-data/Cargo.toml index be26ab4..9dfc1aa 100644 --- a/attest-data/Cargo.toml +++ b/attest-data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "attest-data" -version = "0.3.0" +version = "0.4.0" edition = "2021" [dependencies] diff --git a/attest-data/src/messages.rs b/attest-data/src/messages.rs index 96e833c..221d914 100644 --- a/attest-data/src/messages.rs +++ b/attest-data/src/messages.rs @@ -82,13 +82,13 @@ pub enum HostToRotError { /// Unexpected command returned UnexpectedCommand, /// Error return from the sprot command - SprotError(SprotError), + SprotError(RecvSprotError), } #[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)] #[repr(u32)] // Errors returned from the hubris side. This is _so many_ -pub enum SprotError { +pub enum RecvSprotError { // protocol /// CRC check failed. ProtocolInvalidCrc, @@ -164,8 +164,8 @@ pub enum RotToHost { RotTqSign, } -impl From for RotToHost { - fn from(e: SprotError) -> Self { +impl From for RotToHost { + fn from(e: RecvSprotError) -> Self { RotToHost::HostToRotError(HostToRotError::SprotError(e)) } }