From a455637d28fb209a4677f55d887aa91ca05ed44e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 17:25:03 +0200
Subject: lib/debug: remove the deprecated strict function

The grace period was long enough.
---
 lib/debug.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/debug.nix')

diff --git a/lib/debug.nix b/lib/debug.nix
index d5e9473ff773..7eaa1bd9c8b1 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -102,10 +102,6 @@ rec {
   # usage: { testX = allTrue [ true ]; }
   testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
 
-  strict = v:
-    trace "Warning: strict is deprecated and will be removed in the next release"
-      (builtins.seq v v);
-
   # example: (traceCallXml "myfun" id 3) will output something like
   # calling myfun arg 1: 3 result: 3
   # this forces deep evaluation of all arguments and the result!
@@ -119,10 +115,10 @@ rec {
       in (str: expr:
           if isFunction expr then
             (arg:
-              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg)
+              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg)
             )
           else
-            let r = strict expr;
+            let r = builtins.seq expr expr;
             in trace "${str}\n result:\n${builtins.toXML r}" r
       );
 }
-- 
cgit v1.2.3