diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-07-19T17·03+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-07-19T19·02+0000 |
| commit | 7a8880a0df579eeed7be2121dcd666cdb7e50f07 (patch) | |
| tree | f6017b374e7979397941f61355cad33c18c7afd4 /third_party/nix/src | |
| parent | 324d385b29979dee066a36250cfea9e030f24bfe (diff) | |
refactor(3p/nix): Remove remaining prefork-compat type r/1401
Removes the verbosity enum, which is no longer actively used anywhere other than a daemon protocol implementation bit that doesn't actually work. Since the verbosity was marked deprecated, this removes one of the last remaining warnings. Change-Id: Iaee9d1d6c14b30daac83bb44bcacff32a0e07fb0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1289 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/src')
| -rw-r--r-- | third_party/nix/src/libstore/remote-store.cc | 14 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/prefork-compat.hh | 21 |
3 files changed, 5 insertions, 31 deletions
diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc index 7570255330c6..7c4f3a138fc0 100644 --- a/third_party/nix/src/libstore/remote-store.cc +++ b/third_party/nix/src/libstore/remote-store.cc @@ -19,7 +19,6 @@ #include "libutil/archive.hh" #include "libutil/finally.hh" #include "libutil/pool.hh" -#include "libutil/prefork-compat.hh" #include "libutil/serialise.hh" #include "libutil/util.hh" @@ -167,14 +166,11 @@ void RemoteStore::initConnection(Connection& conn) { void RemoteStore::setOptions(Connection& conn) { conn.to << wopSetOptions << static_cast<uint64_t>(settings.keepFailed) << static_cast<uint64_t>(settings.keepGoing) - // TODO(tazjin): Remove the verbosity stuff here. - << static_cast<uint64_t>(settings.tryFallback) << compat::kInfo - << settings.maxBuildJobs << settings.maxSilentTime - << 1u - // TODO(tazjin): what behaviour does this toggle remotely? - << (settings.verboseBuild ? compat::kError : compat::kVomit) - << 0 // obsolete log type - << 0 /* obsolete print build trace */ + << static_cast<uint64_t>(settings.tryFallback) + << /* previously: verbosity = */ 0 << settings.maxBuildJobs + << settings.maxSilentTime << 1u + << /* previously: remote verbosity = */ 0 << 0 // obsolete log type + << 0 /* obsolete print build trace */ << settings.buildCores << static_cast<uint64_t>(settings.useSubstitutes); diff --git a/third_party/nix/src/libutil/CMakeLists.txt b/third_party/nix/src/libutil/CMakeLists.txt index a9736b37bc05..53a0cb2bc45c 100644 --- a/third_party/nix/src/libutil/CMakeLists.txt +++ b/third_party/nix/src/libutil/CMakeLists.txt @@ -18,7 +18,6 @@ set(HEADER_FILES lru-cache.hh monitor-fd.hh pool.hh - prefork-compat.hh ref.hh serialise.hh sync.hh diff --git a/third_party/nix/src/libutil/prefork-compat.hh b/third_party/nix/src/libutil/prefork-compat.hh deleted file mode 100644 index ae9c25e5397b..000000000000 --- a/third_party/nix/src/libutil/prefork-compat.hh +++ /dev/null @@ -1,21 +0,0 @@ -// This file exists to preserve compatibility with the pre-fork -// version of Nix (2.3.4). -// -// During the refactoring, various structures are getting ripped out -// and replaced with the dummies below while code is being cleaned up. - -#ifndef NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_ -#define NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_ - -namespace nix::compat { - -// This is used in remote-store.cc for various things that expect the -// old logging protocol when talking over the wire. It will be removed -// hen the worker protocol is redone. -enum [[deprecated("old logging compat only")]] Verbosity{ - kError = 0, kWarn, kInfo, kTalkative, kChatty, kDebug, kVomit, -}; - -} // namespace nix::compat - -#endif // NIX_SRC_LIBUTIL_PREFORK_COMPAT_H_ |