Skip to content

Commit

Permalink
Avoid name conflict
Browse files Browse the repository at this point in the history
Change the name `SprotError` in `attest-data` to avoid conflicts with
the hubris `SprotError`. Rust handles this just fine but our external
hiffy tooling does not handle this case.
  • Loading branch information
labbott committed Oct 8, 2024
1 parent 2583c9e commit d5b2ad0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ zeroize = { version = "1.5.7", default-features = false, features = ["zeroize_de
zip = { version = "0.6", default-features = false, features = ["bzip2"] }

# Oxide forks and repos
attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.3.0" }
attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, rev = "634fe9e6e35ad66c2c66b5b1056e0f1384479545" }
dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion drv/sprot-api/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use dumper_api::DumperError;
use hubpack::SerializedSize;
use serde::{Deserialize, Serialize};

use attest_data::messages::SprotError as AttestDataSprotError;
use attest_data::messages::RecvSprotError as AttestDataSprotError;
use gateway_messages::{
RotError, RotWatchdogError as GwRotWatchdogError, SpError,
SprocketsError as GwSprocketsErr,
Expand Down
2 changes: 1 addition & 1 deletion task/host-sp-comms/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use drv_stm32h7_usart as drv_usart;

use attest_data::messages::{
HostToRotCommand, RotToHost, SprotError as AttestDataSprotError,
HostToRotCommand, RecvSprotError as AttestDataSprotError, RotToHost,
MAX_DATA_LEN,
};
use drv_gimlet_seq_api::{PowerState, SeqError, Sequencer};
Expand Down

0 comments on commit d5b2ad0

Please sign in to comment.