colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.modules: Refactor option scanning slightly

Browse Source 
This scans the options with fewer function calls, improving performance.

It also removes a let Env from the happy flow of the new logic.
This commit is contained in:
Robert Hensing 2022-02-24 14:23:02 +01:00
parent 58a8a48e9d
commit 0c09eb343d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/modules.nix
View File

@ -9,7 +9,6 @@ let
catAttrs
concatLists
concatMap
count
elem
filter
findFirst
@ -492,20 +491,16 @@ rec {
loc = prefix ++ [name];
defns = defnsByName.${name} or [];
defns' = defnsByName'.${name} or [];
nrOptions = count (m: isOption m.options) decls;
optionDecls = filter (m: isOption m.options) decls;
in
if nrOptions == length decls then
if length optionDecls == length decls then
let opt = fixupOptionType loc (mergeOptionDecls loc decls);
in {
matchedOptions = evalOptionValue loc opt defns';
unmatchedDefns = [];
}
else if nrOptions != 0 then
let
firstOption = findFirst (m: isOption m.options) "" decls;
firstNonOption = findFirst (m: !isOption m.options) "" decls;
in
if firstOption.options.type.name == "submodule"
else if optionDecls != [] then
if (lib.head optionDecls).options.type.name == "submodule"
then
let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls));
in {
@ -513,7 +508,10 @@ rec {
unmatchedDefns = [];
}
else
throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
let
firstNonOption = findFirst (m: !isOption m.options) "" decls;
in
throw "The option `${showOption loc}' in `${(lib.head optionDecls)._file}' is a prefix of options in `${firstNonOption._file}'."
else
mergeModules' loc decls defns) declsByName;