From 8e8c22ce6514aebe35b1afb67f866bc20a277738 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Fri, 14 Jun 2024 12:28:59 +0100 Subject: [PATCH] lib/options: rename `convertArgs` to `processDefaultNullArgs` --- lib/options.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index a262bec9..9a2f06fd 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -151,7 +151,7 @@ rec { defaultNullOpts = let # Ensures that default is null and defaultText is not set - convertArgs = + processDefaultNullArgs = args: assert args ? default @@ -165,7 +165,7 @@ rec { # TODO: removed 2024-06-14; remove stub 2024-09-01 mkDesc = abort "mkDesc has been removed. Use the `pluginDefault` argument or `helpers.pluginDefaultText`."; - mkNullable' = args: mkNullOrOption' (convertArgs args); + mkNullable' = args: mkNullOrOption' (processDefaultNullArgs args); mkNullable = type: pluginDefault: description: mkNullable' { inherit type pluginDefault description; }; @@ -176,20 +176,20 @@ rec { type: pluginDefault: description: mkNullableWithRaw' { inherit type pluginDefault description; }; - mkStrLuaOr' = args: mkNullOrStrLuaOr' (convertArgs args); + mkStrLuaOr' = args: mkNullOrStrLuaOr' (processDefaultNullArgs args); mkStrLuaOr = type: pluginDefault: description: mkStrLuaOr' { inherit type pluginDefault description; }; - mkStrLuaFnOr' = args: mkNullOrStrLuaFnOr' (convertArgs args); + mkStrLuaFnOr' = args: mkNullOrStrLuaFnOr' (processDefaultNullArgs args); mkStrLuaFnOr = type: pluginDefault: description: mkStrLuaFnOr' { inherit type pluginDefault description; }; - mkLua' = args: mkNullOrLua' (convertArgs args); + mkLua' = args: mkNullOrLua' (processDefaultNullArgs args); mkLua = pluginDefault: description: mkLua' { inherit pluginDefault description; }; - mkLuaFn' = args: mkNullOrLuaFn' (convertArgs args); + mkLuaFn' = args: mkNullOrLuaFn' (processDefaultNullArgs args); mkLuaFn = pluginDefault: description: mkLuaFn' { inherit pluginDefault description; }; mkNum' = args: mkNullableWithRaw' (args // { type = types.number; });