Merge pull request #121816 from hercules-ci/revert-99132-recursive-type-deprecation

Revert 99132 recursive type deprecation

lib/modules.nix

···
       # yield a value computed from the definitions
       value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue;
 
-      # Issue deprecation warnings recursively over all nested types of the
-      # given type. But don't recurse if a type with the same name was already
-      # visited before in order to prevent infinite recursion. So this only
-      # warns once per type name.
-      # Returns the new set of visited type names
-      recursiveWarn = visited: type:
-        let
-          maybeWarn = warnIf (type.deprecationMessage != null)
-            "The type `types.${type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${type.deprecationMessage}";
-        in
-          if visited ? ${type.name} then visited
-          else lib.foldl' recursiveWarn (maybeWarn visited // { ${type.name} = null; }) (lib.attrValues type.nestedTypes);
+      warnDeprecation =
+        warnIf (opt.type.deprecationMessage != null)
+          "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}";
 
-    in builtins.seq (recursiveWarn {} opt.type) opt //
+    in warnDeprecation opt //
       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
         inherit (res.defsFinal') highestPrio;
         definitions = map (def: def.value) res.defsFinal;

lib/tests/modules.sh

···
 checkConfigOutput "b a" config.result ./functionTo/list-order.nix
 checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
 
-## Type deprecation
-checkConfigError 'The type `types.simple'\'' of option `simple'\'' defined in .* is deprecated. simple shall not be used' config.simple ./type-deprecation.nix
-checkConfigError 'The type `types.infinite'\'' of option `infinite'\'' defined in .* is deprecated. infinite shall not be used' config.infinite ./type-deprecation.nix
-checkConfigError 'The type `types.left'\'' of option `nested'\'' defined in .* is deprecated. left shall not be used' config.nested ./type-deprecation.nix
-checkConfigError 'The type `types.right'\'' of option `nested'\'' defined in .* is deprecated. right shall not be used' config.nested ./type-deprecation.nix
-
 cat <<EOF
 ====== module tests ======
 $pass Pass

lib/tests/modules/type-deprecation.nix

···
-{ lib, ... }: {
-
-  options.simple = lib.mkOption {
-    type = lib.mkOptionType {
-      name = "simple";
-      deprecationMessage = "simple shall not be used";
-    };
-    default = throw "";
-  };
-
-  options.infinite = lib.mkOption {
-    type =
-      let
-        t = lib.mkOptionType {
-          name = "infinite";
-          deprecationMessage = "infinite shall not be used";
-        };
-        r = lib.types.either t (lib.types.attrsOf r);
-      in r;
-    default = throw "";
-  };
-
-  options.nested = lib.mkOption {
-    type =
-      let
-        left = lib.mkOptionType {
-          name = "left";
-          deprecationMessage = "left shall not be used";
-        };
-        right = lib.mkOptionType {
-          name = "right";
-          deprecationMessage = "right shall not be used";
-        };
-      in lib.types.either left right;
-
-    default = throw "";
-  };
-
-}