treewide: Stop using ancient let syntax

Shows for how long these tests have not been touched by anyone …

Change-Id: I3d0c1209a86283ddb012db4e7d45073264fdd0eb

tests/functional/lang/eval-fail-assert.err.exp

@@ -1,28 +1,21 @@
 error:
-       … while evaluating the attribute 'body'
-         at /pwd/lang/eval-fail-assert.nix:4:3:
-            3|
-            4|   body = x "x";
-             |   ^
-            5| }
-
        … from call site
-         at /pwd/lang/eval-fail-assert.nix:4:10:
+         at /pwd/lang/eval-fail-assert.nix:4:1:
-            3|
+            3| in
-            4|   body = x "x";
+            4| x "x"
-             |          ^
+             | ^
-            5| }
+            5|
 
        … while calling 'x'
          at /pwd/lang/eval-fail-assert.nix:2:7:
-            1| let {
+            1| let
             2|   x = arg: assert arg == "y"; 123;
              |       ^
-            3|
+            3| in
 
        error: assertion '(arg == "y")' failed
        at /pwd/lang/eval-fail-assert.nix:2:12:
-            1| let {
+            1| let
             2|   x = arg: assert arg == "y"; 123;
              |            ^
-            3|
+            3| in

tests/functional/lang/eval-fail-assert.nix

@@ -1,5 +1,4 @@
-let {
+let
   x = arg: assert arg == "y"; 123;
-
+in
-  body = x "x";
+x "x"
-}

tests/functional/lang/eval-fail-blackhole.err.exp

@@ -1,14 +1,6 @@
-error:
+error: infinite recursion encountered
-       … while evaluating the attribute 'body'
+       at /pwd/lang/eval-fail-blackhole.nix:2:7:
-         at /pwd/lang/eval-fail-blackhole.nix:2:3:
+            1| let
-            1| let {
+            2|   x = y;
-            2|   body = x;
-             |   ^
-            3|   x = y;
-
-       error: infinite recursion encountered
-       at /pwd/lang/eval-fail-blackhole.nix:3:7:
-            2|   body = x;
-            3|   x = y;
              |       ^
-            4|   y = x;
+            3|   y = x;

tests/functional/lang/eval-fail-blackhole.nix

@@ -1,5 +1,5 @@
-let {
+let
-  body = x;
   x = y;
   y = x;
-}
+in
+x

tests/functional/lang/eval-fail-remove.err.exp

@@ -1,15 +1,7 @@
-error:
+error: attribute 'x' missing
-       … while evaluating the attribute 'body'
+       at /pwd/lang/eval-fail-remove.nix:4:3:
-         at /pwd/lang/eval-fail-remove.nix:4:3:
+            3| in
-            3|
+            4|   (removeAttrs attrs ["x"]).x
-            4|   body = (removeAttrs attrs ["x"]).x;
              |   ^
-            5| }
+            5|
-
-       error: attribute 'x' missing
-       at /pwd/lang/eval-fail-remove.nix:4:10:
-            3|
-            4|   body = (removeAttrs attrs ["x"]).x;
-             |          ^
-            5| }
        Did you mean y?

tests/functional/lang/eval-fail-remove.nix

@@ -1,5 +1,4 @@
-let {
+let
   attrs = {x = 123; y = 456;};
-
+in
-  body = (removeAttrs attrs ["x"]).x;
+  (removeAttrs attrs ["x"]).x
-}

tests/functional/lang/eval-fail-scope-5.err.exp

@@ -1,28 +1,21 @@
 error:
-       … while evaluating the attribute 'body'
-         at /pwd/lang/eval-fail-scope-5.nix:8:3:
-            7|
-            8|   body = f {};
-             |   ^
-            9|
-
        … from call site
-         at /pwd/lang/eval-fail-scope-5.nix:8:10:
+         at /pwd/lang/eval-fail-scope-5.nix:7:3:
-            7|
+            6| in
-            8|   body = f {};
+            7|   f {}
-             |          ^
+             |   ^
-            9|
+            8|
 
        … while calling 'f'
-         at /pwd/lang/eval-fail-scope-5.nix:6:7:
+         at /pwd/lang/eval-fail-scope-5.nix:5:7:
-            5|
+            4|
-            6|   f = {x ? y, y ? x}: x + y;
+            5|   f = {x ? y, y ? x}: x + y;
              |       ^
-            7|
+            6| in
 
        error: infinite recursion encountered
-       at /pwd/lang/eval-fail-scope-5.nix:6:12:
+       at /pwd/lang/eval-fail-scope-5.nix:5:12:
-            5|
+            4|
-            6|   f = {x ? y, y ? x}: x + y;
+            5|   f = {x ? y, y ? x}: x + y;
              |            ^
-            7|
+            6| in

tests/functional/lang/eval-fail-scope-5.nix

@@ -1,10 +1,7 @@
-let {
+let
-
   x = "a";
   y = "b";
 
   f = {x ? y, y ? x}: x + y;
-
+in
-  body = f {};
+  f {}
-
-}

tests/functional/lang/eval-okay-arithmetic.nix

@@ -1,6 +1,6 @@
 with import ./lib.nix;
 
-let {
+let
 
   /* Supposedly tail recursive version:
 
@@ -15,7 +15,8 @@ let {
 
   err = abort "urgh";
 
-  body = sum
+in
+  sum
     [ (sum (range 1 50))
       (123 + 456)
       (0 + -10 + -(-11) + -x)
@@ -54,6 +55,5 @@ let {
       (if "aa" < "ab" then 1 else err)
       (if "aa" < "aa" then err else 1)
       (if "foo" < "foobar" then 1 else err)
-    ];
+    ]
 
-}

tests/functional/lang/eval-okay-attrs.nix

@@ -1,5 +1,8 @@
-let {
+let
   as = { x = 123; y = 456; } // { z = 789; } // { z = 987; };
-
+in
-  body = if as ? a then as.a else assert as ? z; as.z;
+if as ? a then
-}
+  as.a
+else
+  assert as ? z;
+  as.z

tests/functional/lang/eval-okay-attrs2.nix

@@ -1,10 +1,11 @@
-let {
+let
   as = { x = 123; y = 456; } // { z = 789; } // { z = 987; };
 
   A = "a";
   Z = "z";
 
-  body = if builtins.hasAttr A as
+in
-         then builtins.getAttr A as
+if builtins.hasAttr A as then
-         else assert builtins.hasAttr Z as; builtins.getAttr Z as;
+  builtins.getAttr A as
-}
+else
+  assert builtins.hasAttr Z as; builtins.getAttr Z as

tests/functional/lang/eval-okay-builtins.nix

@@ -1,12 +1,11 @@
 assert builtins ? currentSystem;
 assert !builtins ? __currentSystem;
 
-let {
+let
 
   x = if builtins ? dirOf then builtins.dirOf /foo/bar else "";
 
   y = if builtins ? fnord then builtins.fnord "foo" else "";
 
-  body = x + y;
+in
-  
+x + y
-}

tests/functional/lang/eval-okay-flatten.nix

@@ -1,8 +1,8 @@
 with import ./lib.nix;
 
-let {
+let
 
   l = ["1" "2" ["3" ["4"] ["5" "6"]] "7"];
 
-  body = concat (flatten l);
+in
-}
+concat (flatten l)

tests/functional/lang/eval-okay-list.nix

@@ -1,7 +1,3 @@
 with import ./lib.nix;
 
-let {
+concat ["foo" "bar" "bla" "test"]
-
-  body = concat ["foo" "bar" "bla" "test"];
-    
-}

tests/functional/lang/eval-okay-remove.nix

@@ -1,5 +1,4 @@
-let {
+let
   attrs = {x = 123; y = 456;};
-
+in
-  body = (removeAttrs attrs ["x"]).y;
+(removeAttrs attrs ["x"]).y
-}

tests/functional/lang/eval-okay-scope-4.nix

@@ -1,10 +1,7 @@
-let {
+let
-
   x = "a";
   y = "b";
 
   f = {x ? y, y ? x}: x + y;
-
+in
-  body = f {x = "c";} + f {y = "d";};
+f {x = "c";} + f {y = "d";}
-
-}

tests/functional/lang/eval-okay-scope-6.nix

@@ -1,7 +1,5 @@
-let {
+let
 
   f = {x ? y, y ? x}: x + y;
-
+in
-  body = f {x = "c";} + f {y = "d";};
+f {x = "c";} + f {y = "d";}
-
-}

tests/functional/lang/eval-okay-with.nix

@@ -1,4 +1,4 @@
-let {
+let
 
   a = "xyzzy";
 
@@ -15,5 +15,5 @@ let {
 
   y = with as; with bs; a + b;
 
-  body = x + y;
+in
-}
+x + y

tests/functional/lang/parse-fail-dup-attrs-2.nix

@@ -1,4 +1,4 @@
-let {
+rec {
 
   as = {
     x = 123;

tests/functional/lang/parse-fail-dup-attrs-3.nix

@@ -1,4 +1,4 @@
-let {
+rec {
 
   as = {
     x = 123;

tests/functional/lang/parse-fail-regression-20060610.err.exp

@@ -1,6 +1,6 @@
 error: undefined variable 'gcc'
-       at «stdin»:9:13:
+       at «stdin»:9:11:
-            8|   body = ({
+            8| ({
-            9|     inherit gcc;
+            9|   inherit gcc;
-             |             ^
+             |           ^
-           10|   }).gcc;
+           10| }).gcc

tests/functional/lang/parse-fail-regression-20060610.nix

@@ -1,11 +1,10 @@
-let {
+let
   x =
     {gcc}:
     {
       inherit gcc;
     };
-
+in
-  body = ({
+({
-    inherit gcc;
+  inherit gcc;
-  }).gcc;
+}).gcc
-}

tests/functional/lang/parse-fail-undef-var-2.nix

@@ -1,7 +1,6 @@
-let {
+let
 
   f = {x, y : ["baz" "bar" z "bat"]}: x + y;
 
-  body = f {x = "foo"; y = "bar";};
+in
-
+f {x = "foo"; y = "bar";}
-}