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>
This commit is contained in:
parent
a1965e9182
commit
42bdaacca6
6 changed files with 16 additions and 16 deletions
6
third_party/nix/src/libexpr/json-to-value.hh
vendored
6
third_party/nix/src/libexpr/json-to-value.hh
vendored
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
namespace nix {
|
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
|
||||||
|
|
4
third_party/nix/src/libstore/build.cc
vendored
4
third_party/nix/src/libstore/build.cc
vendored
|
@ -1530,9 +1530,9 @@ void replaceValidPath(const Path& storePath, const Path& tmpPath) {
|
||||||
deletePath(oldPath);
|
deletePath(oldPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
MakeError(NotDeterministic, BuildError)
|
MakeError(NotDeterministic, BuildError);
|
||||||
|
|
||||||
void DerivationGoal::buildDone() {
|
void DerivationGoal::buildDone() {
|
||||||
trace("build done");
|
trace("build done");
|
||||||
|
|
||||||
/* Release the build user at the end of this function. We don't do
|
/* Release the build user at the end of this function. We don't do
|
||||||
|
|
4
third_party/nix/src/libutil/args.hh
vendored
4
third_party/nix/src/libutil/args.hh
vendored
|
@ -10,9 +10,9 @@
|
||||||
|
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
||||||
MakeError(UsageError, Error)
|
MakeError(UsageError, Error);
|
||||||
|
|
||||||
enum HashType : char;
|
enum HashType : char;
|
||||||
|
|
||||||
class Args {
|
class Args {
|
||||||
public:
|
public:
|
||||||
|
|
6
third_party/nix/src/libutil/serialise.hh
vendored
6
third_party/nix/src/libutil/serialise.hh
vendored
|
@ -235,10 +235,10 @@ Sink& operator<<(Sink& sink, const std::string& s);
|
||||||
Sink& operator<<(Sink& sink, const Strings& s);
|
Sink& operator<<(Sink& sink, const Strings& s);
|
||||||
Sink& operator<<(Sink& sink, const StringSet& s);
|
Sink& operator<<(Sink& sink, const StringSet& s);
|
||||||
|
|
||||||
MakeError(SerialisationError, Error)
|
MakeError(SerialisationError, Error);
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
T readNum(Source& source) {
|
T readNum(Source& source) {
|
||||||
unsigned char buf[8];
|
unsigned char buf[8];
|
||||||
source(buf, sizeof(buf));
|
source(buf, sizeof(buf));
|
||||||
|
|
||||||
|
|
8
third_party/nix/src/libutil/thread-pool.hh
vendored
8
third_party/nix/src/libutil/thread-pool.hh
vendored
|
@ -11,11 +11,11 @@
|
||||||
|
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
||||||
MakeError(ThreadPoolShutDown, Error)
|
MakeError(ThreadPoolShutDown, Error);
|
||||||
|
|
||||||
/* A simple thread pool that executes a queue of work items
|
/* A simple thread pool that executes a queue of work items
|
||||||
(lambdas). */
|
(lambdas). */
|
||||||
class ThreadPool {
|
class ThreadPool {
|
||||||
public:
|
public:
|
||||||
ThreadPool(size_t maxThreads = 0);
|
ThreadPool(size_t maxThreads = 0);
|
||||||
|
|
||||||
|
|
4
third_party/nix/src/libutil/types.hh
vendored
4
third_party/nix/src/libutil/types.hh
vendored
|
@ -93,9 +93,9 @@ class BaseError : public std::exception {
|
||||||
using superClass::superClass; \
|
using superClass::superClass; \
|
||||||
};
|
};
|
||||||
|
|
||||||
MakeError(Error, BaseError)
|
MakeError(Error, BaseError);
|
||||||
|
|
||||||
class SysError : public Error {
|
class SysError : public Error {
|
||||||
public:
|
public:
|
||||||
int errNo;
|
int errNo;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue