Replace anyhow with structured error types in support crates#1755
Merged
Conversation
Ericson2314
force-pushed
the
error-types
branch
2 times, most recently
from
aa464be to
8f51404
Compare
Ericson2314
changed the title
anyhow with structured error types in support crates
Member
|
Sounds good. This composes better with the underlying libraries |
Member
|
Should the postgres server not also be stopped in the script? Update missed the trap |
Ericson2314
commented
May 20, 2026
Member
Author
There was a problem hiding this comment.
Note: end applications are done in the next PR
Conni2461
approved these changes
May 20, 2026
| &store_dir, | ||
| &drv_path, | ||
| format!( | ||
| r#"Derive([("out","/nix/store/{HASH}-test-src","sha256","deadbeef00000000000000000000000000000000000000000000000000000000")],[],[],"{0}","{0}",[],[("name","test-src")])"#, |
Member
There was a problem hiding this comment.
i still think we want {HASH}, a fake hash here
Member
Author
There was a problem hiding this comment.
This is a preexisting error (should be separate commit). This is actually correct, the ATerm parser will complain if the hash and the store path do not agree, which is good.
Member
There was a problem hiding this comment.
unrelated question but are we running cargo test currently in CI?
Member
Author
There was a problem hiding this comment.
No we aren't, it wasn't working when I first tried, only impurely. That would be a good thing to fix.
Harmonia's ATerm parser validates that CAFixed output paths match the content hash. The placeholder `aaaa...` was accepted by the older parser but is now rejected with `CAFixed output path mismatch`. Use the correct base32 hash that sha256:deadbeef... produces for name "test-src".
Introduce typed error enums so callers can distinguish error kinds
(e.g. DB infrastructure failure vs bad data) without string matching.
This lays the groundwork for the future error handling cleanups, by
allowing us to see more clearly what changes are made.
db crate:
- New `db::Error` enum: `Sql` (infrastructure) vs `Data(DataError)`
- `DataError` has `StorePath`, `StorePathName`, `IntConversion`, and
`BuildProductMissingPath { build_id, productnr }` variants
- `BuildProductRow` now carries `build` and `productnr` from the query
so error messages identify the offending row
- Removed `anyhow` dependency
nix-utils crate:
- Replaced `Error::Anyhow` catch-all with `DerivationParse` and
`StorePathName` variants
- Fixed CA fixed-output test to use correct output path
- Removed `anyhow` dependency
store-transfer crate:
- New `Error` enum: `Store`, `Grpc`, `Io`, `Protocol`, `Join`
- `ProtocolError` sub-enum: `EmptyStream`, `MissingHeader`,
`MissingGrpcField`, `InvalidPathInfo`, `TruncatedNar`
- Removed `anyhow` dependency
nix-support crate:
- `anyhow::Result` → `std::io::Result` (all errors are IO)
- Removed `anyhow` dependency
hydra-tracing crate:
- `anyhow::Result` → `Result<_, Box<dyn Error>>` (init-only)
- Removed `anyhow` dependency
binary-cache crate:
- `InvalidS3Scheme` and `InvalidCompression` error structs with
named `got` field replace `String` error variants
- `UrlParseError` variants renamed for clarity
proto crate:
- `NarInfoConvertError` now implements `std::error::Error`
Also adds `sqlx-prepare.sh` for regenerating the sqlx offline cache.
Member
Author
|
OK Thanks! All the |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Introduce typed error enums so callers can distinguish error kinds
(e.g. DB infrastructure failure vs bad data) without string matching.
This lays the groundwork for the future error handling cleanups, by
allowing us to see more clearly what changes are made.
db crate:
db::Errorenum:Sql(infrastructure) vsData(DataError)DataErrorhasStorePath,StorePathName,IntConversion, andBuildProductMissingPath { build_id, productnr }variantsBuildProductRownow carriesbuildandproductnrfrom the queryso error messages identify the offending row
anyhowdependencynix-utils crate:
Error::Anyhowcatch-all withDerivationParseandStorePathNamevariantsanyhowdependencystore-transfer crate:
Errorenum:Store,Grpc,Io,Protocol,JoinProtocolErrorsub-enum:EmptyStream,MissingHeader,MissingGrpcField,InvalidPathInfo,TruncatedNaranyhowdependencynix-support crate:
anyhow::Result→std::io::Result(all errors are IO)anyhowdependencyhydra-tracing crate:
anyhow::Result→Result<_, Box<dyn Error>>(init-only)anyhowdependencybinary-cache crate:
InvalidS3SchemeandInvalidCompressionerror structs withnamed
gotfield replaceStringerror variantsUrlParseErrorvariants renamed for clarityproto crate:
NarInfoConvertErrornow implementsstd::error::ErrorAlso adds
sqlx-prepare.shfor regenerating the sqlx offline cache.