Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid name conflict #1897

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Avoid name conflict #1897

merged 2 commits into from
Oct 8, 2024

Conversation

labbott
Copy link
Collaborator

@labbott labbott commented Oct 8, 2024

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.

@labbott labbott marked this pull request as draft October 8, 2024 13:45
@labbott labbott force-pushed the sprot_error_conflict branch 2 times, most recently from d5b2ad0 to 9651b8b Compare October 8, 2024 17:31
@labbott
Copy link
Collaborator Author

labbott commented Oct 8, 2024

fixes #1896

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.
@labbott labbott marked this pull request as ready for review October 8, 2024 18:06
@labbott labbott merged commit 66500a6 into master Oct 8, 2024
106 checks passed
@labbott labbott deleted the sprot_error_conflict branch October 8, 2024 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants