lib/modules: Use options apply function even if no values are defined
#66407
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
This allows `apply` functions to return a valid value if they completely ignore their argument, which is the case for the option renaming functions like `mkAliasOptionModule`. Therefore this solves issue NixOS#63693
|
Nix proof to eliminate any doubt of this breaking anything :) Proof of backwards-compatibility: If Let's look at the old definition: if !res.isDefined then
throw "The option `${showOption loc}' is used but not defined."
else if opt ? apply then
opt.apply res.mergedValue
else
res.mergedValueSince we can assume that it succeeded before, the first case can't happen, so if opt ? apply then
opt.apply res.mergedValue
else
res.mergedValueNow let's show that with let
valueDefined = if res.isDefined then res.mergedValue else
throw "The option `${showOption loc}' is used but not defined.";
in
if opt ? apply then opt.apply valueDefined else valueDefinedInsert the value let
valueDefined = res.mergedValue;
in
if opt ? apply then opt.apply valueDefined else valueDefinedInline: if opt ? apply then
opt.apply res.mergedValue
else
res.mergedValueWhich is the same as before. QED |
10 tasks
1 task
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 for this change
This allows
applyfunctions to return a valid value if they completelyignore their argument, which is the case for the option renaming
functions like
mkAliasOptionModule. Therefore this fixes #63693, meaning the more intrusive fix in #63719 won't be neededThis is a 100% guaranteed backwards compatible change (aka, what succeeded previously will continue to succeed) and doesn't increase the module API surface
Ping @nbp @Profpatsch @j-piecuch @rycee
Things done
lib/tests/modules.shsuccessfully