Simplify handling of statuses for build errors #13854
Merged
+152
−91
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.
Motivation
Instead of passing them around separately, or doing finicky logic in a try-catch block to recover them, just make
BuildError
always contain a status, and make it the thrower's responsibility to set it. This is much more simple and explicit.Once that change is done, split the
done
functions ofDerivationGoal
andDerivationBuildingGoal
into separate success and failure functions, which ends up being easier to understand and hardly any duplication.Also, change the handling of failures in resolved cases to use
BuildResult::DependencyFailed
and a new message. This is because the underlying derivation will also get its message printed --- which is good, because in general the resolved derivation is not unique. One dyn drv test had to be updated, but CA (and dyn drv) is experimental, so I do not mind.Finally, delete
SubstError
because it is unused.Context
Part of my
DerivationGoal
cleanupsdepends on #13853
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.