ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

lib/modules.nix: Optimize optionSet legacy compat code

Browse Source 
It's still in the hot path.
This commit is contained in:
Robert Hensing 2022-03-07 11:04:38 +01:00
parent 17bf14a3e7
commit 02de37ca07
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/modules.nix
View File

@ -761,13 +761,13 @@ rec {
options = opt.options or options = opt.options or
(throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
f = tp: f = tp:
let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet");
in
if tp.name == "option set" || tp.name == "submodule" then if tp.name == "option set" || tp.name == "submodule" then
throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."
else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) else if (tp.functor.wrapped.name or null) == "optionSet" then
else if optionSetIn "listOf" then types.listOf (types.submodule options) if tp.name == "attrsOf" then types.attrsOf (types.submodule options)
else if optionSetIn "nullOr" then types.nullOr (types.submodule options) else if tp.name == "listOf" then types.listOf (types.submodule options)
else if tp.name == "nullOr" then types.nullOr (types.submodule options)
else tp
else tp; else tp;
in in
if opt.type.getSubModules or null == null if opt.type.getSubModules or null == null