From 06b541ed66b473860f1b5deb317b68e4034b52ff Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tomberek@gmail.com>
Date: Tue, 1 Feb 2022 15:27:49 -0500
Subject: [PATCH] string_interp: update tests and self-lint

---
 default.nix                     |  4 ++--
 flake.nix                       |  4 ++--
 tests/cases/string/out          | 28 ++++++++++++++--------------
 tests/cases/string_interpol/out |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/default.nix b/default.nix
index 76bb75f..fcf390b 100644
--- a/default.nix
+++ b/default.nix
@@ -5,9 +5,9 @@ let
   flakeCompatSrc =
     builtins.fetchTarball
       {
-        url = "https://github.com/edolstra/flake-compat/archive/${ flakeCompat.rev }.tar.gz";
+        url = "https://github.com/edolstra/flake-compat/archive/${flakeCompat.rev}.tar.gz";
         sha256 = flakeCompat.narHash;
       };
   flake = import flakeCompatSrc { src = ./.; };
 in
-  flake.defaultNix.defaultPackage
+flake.defaultNix.defaultPackage
diff --git a/flake.nix b/flake.nix
index 012fea5..2a9a990 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
             checks = { defaultPackage = inputs.self.defaultPackage.${ system }; };
             defaultApp = {
               type = "app";
-              program = "${ inputs.self.defaultPackage.${ system } }/bin/alejandra";
+              program = "${inputs.self.defaultPackage.${ system }}/bin/alejandra";
             };
             defaultPackage =
               fenixPlatform.buildRustPackage
@@ -41,7 +41,7 @@
                       commit = inputs.self.shortRev or "dirty";
                       date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101";
                     in
-                      "${ builtins.substring 0 8 date }_${ commit }";
+                      "${builtins.substring 0 8 date}_${commit}";
                   src = inputs.self.sourceInfo;
                   cargoLock.lockFile = ./Cargo.lock;
                   meta = {
diff --git a/tests/cases/string/out b/tests/cases/string/out
index f09f349..a65d364 100644
--- a/tests/cases/string/out
+++ b/tests/cases/string/out
@@ -5,7 +5,7 @@
   "
   ###
   "a
-   ${ x }
+   ${x}
    b
   "
   ###
@@ -13,9 +13,9 @@
   ###
   ''a''
   ###
-  ''${ "" }''
+  ''${""}''
   ###
-  ''    ${ "" }
+  ''    ${""}
 
   ''
   ###
@@ -34,10 +34,10 @@
   ###
   ''
       a
-    ${ "" }
+    ${""}
        b
-      ${ "" }
-       c ${ "" } d
+      ${""}
+       c ${""} d
        e
   ''
   ###
@@ -46,7 +46,7 @@
   ###
   ''
     declare -a makefiles=(./*.mak)
-    sed -i -f ${ makefile-sed } "''${makefiles[@]}"
+    sed -i -f ${makefile-sed} "''${makefiles[@]}"
     ### assign Makefile variables eagerly & change backticks to `$(shell …)`
     sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \
       -e 's/`\([^`]\+\)`/$(shell \1)/' \
@@ -54,29 +54,29 @@
   ''
   ###
   ''
-    [${ mkSectionName sectName }]
+    [${mkSectionName sectName}]
   ''
   ###
-  ''-couch_ini ${ cfg.package }/etc/default.ini ${ configFile } ${
+  ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${
     pkgs.writeText "couchdb-extra.ini" cfg.extraConfig
-  } ${ cfg.configFile }''
+  } ${cfg.configFile}''
   ###
   ''exec i3-input -F "mark %s" -l 1 -P 'Mark: ' ''
   ###
   ''exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Go to: ' ''
   ###
-  ''"${ pkgs.name or "<unknown-name>" }";''
+  ''"${pkgs.name or "<unknown-name>"}";''
   ###
   ''
-    ${ pkgs.replace-secret }/bin/replace-secret '${ placeholder }' '${ secretFile }' '${ targetFile }' ''
+    ${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' ''
   ###
   ''
-    mkdir -p "$out/lib/modules/${ kernel.modDirVersion }/kernel/net/wireless/"
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   ''
   ###
   ''    <?xml version="1.0" encoding="UTF-8"?>
     <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     <plist version="1.0">
-    ${ expr "" v }
+    ${expr "" v}
     </plist>''
 ]
diff --git a/tests/cases/string_interpol/out b/tests/cases/string_interpol/out
index 3faa390..9c6cc01 100644
--- a/tests/cases/string_interpol/out
+++ b/tests/cases/string_interpol/out
@@ -6,7 +6,7 @@
     /*
      b
      */
-    "${ c }"
+    "${c}"
   }"
   /*
    d