From 42bdaacca62ad5760e5d46315f1e6dc2bcc3fd96 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Mon, 10 Aug 2020 17:58:35 +0100
Subject: style(tvix): Sort out minor formatting errors

Invocations of the MakeError macro that were not followed by a
semicolon messed up indentation in the next lines.

Change-Id: I03d7d1443f062a38af2c7da3da8928e0ed05e274
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1708
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
---
 third_party/nix/src/libexpr/json-to-value.hh | 6 +++---
 third_party/nix/src/libstore/build.cc        | 4 ++--
 third_party/nix/src/libutil/args.hh          | 4 ++--
 third_party/nix/src/libutil/serialise.hh     | 6 +++---
 third_party/nix/src/libutil/thread-pool.hh   | 8 ++++----
 third_party/nix/src/libutil/types.hh         | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'third_party/nix')

diff --git a/third_party/nix/src/libexpr/json-to-value.hh b/third_party/nix/src/libexpr/json-to-value.hh
index 041a4c596591..7f258f2137ba 100644
--- a/third_party/nix/src/libexpr/json-to-value.hh
+++ b/third_party/nix/src/libexpr/json-to-value.hh
@@ -6,8 +6,8 @@
 
 namespace nix {
 
-MakeError(JSONParseError, EvalError)
+MakeError(JSONParseError, EvalError);
 
-    void parseJSON(EvalState& state, const std::string& s, Value& v);
+void parseJSON(EvalState& state, const std::string& s, Value& v);
 
-}
+}  // namespace nix
diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc
index c48e1abd722a..6aad99b37a40 100644
--- a/third_party/nix/src/libstore/build.cc
+++ b/third_party/nix/src/libstore/build.cc
@@ -1530,9 +1530,9 @@ void replaceValidPath(const Path& storePath, const Path& tmpPath) {
   deletePath(oldPath);
 }
 
-MakeError(NotDeterministic, BuildError)
+MakeError(NotDeterministic, BuildError);
 
-    void DerivationGoal::buildDone() {
+void DerivationGoal::buildDone() {
   trace("build done");
 
   /* Release the build user at the end of this function. We don't do
diff --git a/third_party/nix/src/libutil/args.hh b/third_party/nix/src/libutil/args.hh
index 37904b19aaa8..409ea80f2d45 100644
--- a/third_party/nix/src/libutil/args.hh
+++ b/third_party/nix/src/libutil/args.hh
@@ -10,9 +10,9 @@
 
 namespace nix {
 
-MakeError(UsageError, Error)
+MakeError(UsageError, Error);
 
-    enum HashType : char;
+enum HashType : char;
 
 class Args {
  public:
diff --git a/third_party/nix/src/libutil/serialise.hh b/third_party/nix/src/libutil/serialise.hh
index fbedf0510aa1..d088252fb69e 100644
--- a/third_party/nix/src/libutil/serialise.hh
+++ b/third_party/nix/src/libutil/serialise.hh
@@ -235,10 +235,10 @@ Sink& operator<<(Sink& sink, const std::string& s);
 Sink& operator<<(Sink& sink, const Strings& s);
 Sink& operator<<(Sink& sink, const StringSet& s);
 
-MakeError(SerialisationError, Error)
+MakeError(SerialisationError, Error);
 
-    template <typename T>
-    T readNum(Source& source) {
+template <typename T>
+T readNum(Source& source) {
   unsigned char buf[8];
   source(buf, sizeof(buf));
 
diff --git a/third_party/nix/src/libutil/thread-pool.hh b/third_party/nix/src/libutil/thread-pool.hh
index 23527b907a21..71006238b363 100644
--- a/third_party/nix/src/libutil/thread-pool.hh
+++ b/third_party/nix/src/libutil/thread-pool.hh
@@ -11,11 +11,11 @@
 
 namespace nix {
 
-MakeError(ThreadPoolShutDown, Error)
+MakeError(ThreadPoolShutDown, Error);
 
-    /* A simple thread pool that executes a queue of work items
-       (lambdas). */
-    class ThreadPool {
+/* A simple thread pool that executes a queue of work items
+   (lambdas). */
+class ThreadPool {
  public:
   ThreadPool(size_t maxThreads = 0);
 
diff --git a/third_party/nix/src/libutil/types.hh b/third_party/nix/src/libutil/types.hh
index 3d37e4efee37..dae81fb94b6a 100644
--- a/third_party/nix/src/libutil/types.hh
+++ b/third_party/nix/src/libutil/types.hh
@@ -93,9 +93,9 @@ class BaseError : public std::exception {
     using superClass::superClass;       \
   };
 
-MakeError(Error, BaseError)
+MakeError(Error, BaseError);
 
-    class SysError : public Error {
+class SysError : public Error {
  public:
   int errNo;
 
-- 
cgit 1.4.1