Refactor Raw pattern, part of #7479 #8839
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
github-actions
bot
added
new-cli
edolstra
approved these changes
Aug 18, 2023
| @@ -195,7 +195,7 @@ void LocalDerivationGoal::tryLocalBuild() | |||
| else if (settings.sandboxMode == smDisabled) | |||
| useChroot = false; | |||
| else if (settings.sandboxMode == smRelaxed) | |||
| useChroot = derivationType.isSandboxed() && !noChroot; | |||
| useChroot = derivationType->isSandboxed() && !noChroot; | |||
There was a problem hiding this comment.
Better to use derivationType().value() here, since it's not obvious whether derivationType is initialized. (An assertion failure would be better than an exception though...)
There was a problem hiding this comment.
Good idea, I just added one a few lines above.
Ericson2314
force-pushed
the
string-context-7479
branch
2 times, most recently
from
a6dbd66
to
fedcd53
Compare
Types converted: - `NixStringContextElem` - `OutputsSpec` - `ExtendedOutputsSpec` - `DerivationOutput` - `DerivationType` Existing ones mostly conforming the pattern cleaned up: - `ContentAddressMethod` - `ContentAddressWithReferences` The `DerivationGoal::derivationType` field had a bogus initialization, now caught, so I made it `std::optional`. I think NixOS#8829 can make it non-optional again because it will ensure we always have the derivation when we construct a `DerivationGoal`. See that issue (NixOS#7479) for details on the general goal. `git grep 'Raw::Raw'` indicates the two types I didn't yet convert `DerivedPath` and `BuiltPath` (and their `Single` variants) . This is because @roberth and I (can't find issue right now...) plan on reworking them somewhat, so I didn't want to churn them more just yet. Co-authored-by: Eelco Dolstra <[email protected]>
Ericson2314
force-pushed
the
string-context-7479
branch
from
fedcd53
to
9121fed
Compare
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.
Motivation
Types converted:
NixStringContextElemOutputsSpecExtendedOutputsSpecDerivationOutputDerivationTypeExisting ones mostly conforming the pattern cleaned up:
ContentAddressMethodContentAddressWithReferencesThe
DerivationGoal::derivationTypefield had a bogus initialization, now caught, so I made itstd::optional. I think #8829 can make it non-optional again because it will ensure we always have the derivation when we construct aDerivationGoal.Context
See #7479 for details.
git grep 'Raw::Raw'indicates the two types I didn't yet convertDerivedPathandBuiltPath(and theirSinglevariants) . This is because @roberth and I (can't find issue right now...) plan on reworking them somewhat, so I didn't want to churn them more just yet.Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*Priorities
Add 👍 to pull requests you find important.