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

lib/modules: Minor performance optimisation

Browse Source 
Co-Authored-By: Johannes Kirschbauer <hsjobeki@gmail.com>
This commit is contained in:
Silvan Mosberger
2024-12-02 15:54:20 +01:00
parent 45f0035a83
commit 14f4431d12
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/modules.nix
View File

@@ -763,17 +763,24 @@ let
}; };
}; };
mergedType' = typeSet =
if opt.options ? type then
if res ? type then
if typesMergeable then
{
type =
if mergedType ? functor.wrappedDeprecationMessage then if mergedType ? functor.wrappedDeprecationMessage then
addDeprecatedWrapped mergedType addDeprecatedWrapped mergedType
else else
mergedType; mergedType;
}
typeSet = else
if (bothHave "type") && typesMergeable then # Keep in sync with the same error below!
{ type = mergedType'; } throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}."
else if opt.options ? type && opt.options.type ? functor.wrappedDeprecationMessage then else if opt.options.type ? functor.wrappedDeprecationMessage then
{ type = addDeprecatedWrapped opt.options.type; } { type = addDeprecatedWrapped opt.options.type; }
else
{}
else else
{}; {};
@@ -782,9 +789,9 @@ let
if bothHave "default" || if bothHave "default" ||
bothHave "example" || bothHave "example" ||
bothHave "description" || bothHave "description" ||
bothHave "apply" || bothHave "apply"
(bothHave "type" && (! typesMergeable))
then then
# Keep in sync with the same error above!
throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}."
else else
let let