chore(reth-storage-errors): no_std support #10011
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
martinezjorge
commented
Aug 2, 2024
martinezjorge
commented
Aug 2, 2024
martinezjorge
commented
Aug 2, 2024
martinezjorge
commented
Aug 2, 2024
mattsse
requested changes
Aug 2, 2024
crates/storage/errors/Cargo.toml
Outdated
| @@ -15,8 +15,9 @@ alloy-rlp.workspace = true | |||
| reth-primitives.workspace = true | |||
| reth-fs-util.workspace = true | |||
|
|
|||
| thiserror-no-std = { workspace = true, default-features = false } | |||
| thiserror-no-std = { workspace = true, default-features = false, optional = true} | |||
There was a problem hiding this comment.
I believe we can actually remove this now
shekhirin
reviewed
Aug 2, 2024
crates/storage/errors/src/db.rs
Outdated
| pub enum DatabaseError { | ||
| /// Failed to open the database. | ||
| #[error("failed to open the database: {0}")] | ||
| #[display(fmt="failed to open the database: {_0}")] |
There was a problem hiding this comment.
fmt nit for every occurrence
Suggested change
| #[display(fmt="failed to open the database: {_0}")] | |
| #[display(fmt = "failed to open the database: {_0}")] |
…us error variants
martinezjorge
requested review from
DaniPopes,
rkrasiuk,
Rjected,
joshieDo,
emhane and
fgimenez
as code owners
martinezjorge
force-pushed
the
reth-storage-errors-no_std
branch
from
b64c667
to
4e33140
Compare
|
@mattsse I think this is good to go if you could please take a look when you get a chance |
mattsse
requested changes
Aug 8, 2024
| /// Provider result type. | ||
| pub type ProviderResult<Ok> = Result<Ok, ProviderError>; | ||
|
|
||
| /// Bundled errors variants thrown by various providers. | ||
| #[derive(Clone, Debug, thiserror_no_std::Error, PartialEq, Eq)] | ||
| #[derive(Clone, Debug, Display, From, PartialEq, Eq)] |
There was a problem hiding this comment.
I'd like to not use From here instead impl From for the few variants manually
There was a problem hiding this comment.
what's the argument for this @mattsse ?
There was a problem hiding this comment.
don't like the opt-out attributes, these from impls should be opt-in
emhane
approved these changes
Aug 12, 2024
crates/storage/errors/src/db.rs
Outdated
Comment on lines
101
to
112
| impl fmt::Display for DatabaseWriteError { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| write!( | ||
| f, | ||
| "write operation {} failed for key \"{}\" in table {}: {}", | ||
| self.operation, | ||
| reth_primitives::hex::encode(&self.key), | ||
| self.table_name, | ||
| self.info | ||
| ) | ||
| } | ||
| } |
There was a problem hiding this comment.
should be possible to derive this too, check out example https://docs.rs/derive_more/latest/derive_more/derive.Display.html#custom-trait-bounds
shekhirin
requested changes
Aug 12, 2024
mattsse
approved these changes
Aug 13, 2024
shekhirin
approved these changes
Aug 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Towards #9478
Adds
no_stdsupport toreth-storage-errors.Stacking PRs no longer necessary as implementing source for errors wrapped in error enum variants fixed the issues that were breaking tests.