Fix format errors

Fix formatting violations, update blacklist to reflect moved files.

PR NixOS#10556 passed CI before the new formating rules were added, and our
CI has the race condition of allowing old results, resulting in master
getting broken.

maintainers/flake-module.nix

@@ -252,8 +252,8 @@
         ''^src/libstore/unix/pathlocks\.cc$''
         ''^src/libstore/unix/posix-fs-canonicalise\.cc$''
         ''^src/libstore/unix/posix-fs-canonicalise\.hh$''
-        ''^src/libstore/unix/uds-remote-store\.cc$''
-        ''^src/libstore/unix/uds-remote-store\.hh$''
+        ''^src/libstore/uds-remote-store\.cc$''
+        ''^src/libstore/uds-remote-store\.hh$''
         ''^src/libstore/windows/build\.cc$''
         ''^src/libstore/worker-protocol-impl\.hh$''
         ''^src/libstore/worker-protocol\.cc$''
@@ -350,7 +350,7 @@
         ''^src/libutil/unix/processes\.cc$''
         ''^src/libutil/unix/signals-impl\.hh$''
         ''^src/libutil/unix/signals\.cc$''
-        ''^src/libutil/unix/unix-domain-socket\.cc$''
+        ''^src/libutil/unix-domain-socket\.cc$''
         ''^src/libutil/unix/users\.cc$''
         ''^src/libutil/url-parts\.hh$''
         ''^src/libutil/url\.cc$''

src/libstore/indirect-root-store.cc

@@ -15,15 +15,15 @@ void IndirectRootStore::makeSymlink(const Path & link, const Path & target)
     renameFile(tempLink, link);
 }
 
-
 Path IndirectRootStore::addPermRoot(const StorePath & storePath, const Path & _gcRoot)
 {
     Path gcRoot(canonPath(_gcRoot));
 
     if (isInStore(gcRoot))
         throw Error(
-                "creating a garbage collector root (%1%) in the Nix store is forbidden "
-                "(are you running nix-build inside the store?)", gcRoot);
+            "creating a garbage collector root (%1%) in the Nix store is forbidden "
+            "(are you running nix-build inside the store?)",
+            gcRoot);
 
     /* Register this root with the garbage collector, if it's
        running. This should be superfluous since the caller should

src/libutil/unix-domain-socket.hh

@@ -5,7 +5,7 @@
 #include "file-descriptor.hh"
 
 #ifdef _WIN32
-# include <winsock2.h>
+#  include <winsock2.h>
 #endif
 #include <unistd.h>
 
@@ -21,7 +21,6 @@ AutoCloseFD createUnixDomainSocket();
  */
 AutoCloseFD createUnixDomainSocket(const Path & path, mode_t mode);
 
-
 /**
  * Often we want to use `Descriptor`, but Windows makes a slightly
  * stronger file descriptor vs socket distinction, at least at the level
@@ -39,7 +38,7 @@ using Socket =
 /**
  * Windows gives this a different name
  */
-# define SHUT_WR SD_SEND
+#  define SHUT_WR SD_SEND
 #endif
 
 /**
@@ -70,7 +69,6 @@ static inline Descriptor fromSocket(Socket fd)
 #endif
 }
 
-
 /**
  * Bind a Unix domain socket to a path.
  */