Merge pull request #18511 from ericsagnes/feat/remove-optionSet

modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
parent 46693bd6e8 f923905346
commit 7e80c42b0e
28 changed files with 1101 additions and 1108 deletions
@@ -261,7 +261,7 @@ rec {
    # declarations from the ‘options’ attribute of containing option
    # declaration.
    optionSet = mkOptionType {
-      name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";
+      name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set";
    };

    # Augment the given type with an additional type check function.