maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(tvix): typedef -> using in build.cc/store-api.hh

Browse source 
this shuts up a few lints ...

Change-Id: I51ee9418767e97247f98b170cdad137e5b12b44d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1796
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2020-08-20 03:05:08 +01:00 • committed by tazjin
parent a75c0278db
commit f7fa77f14d
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
third_party/nix/src/libstore/store-api.hh vendored
View file

@ -50,7 +50,7 @@ const size_t storePathHashLen = 32; // i.e. 160 bits
/* Magic header of exportPath() output (obsolete). */
const uint32_t exportMagic = 0x4558494e;
typedef std::unordered_map<Path, std::unordered_set<std::string>> Roots;
using Roots = std::unordered_map<Path, std::unordered_set<std::string>>;
struct GCOptions {
/* Garbage collector operation:
@ -66,12 +66,12 @@ struct GCOptions {
- `gcDeleteSpecific': delete the paths listed in
`pathsToDelete', insofar as they are not reachable.
*/
typedef enum {
using GCAction = enum {
gcReturnLive,
gcReturnDead,
gcDeleteDead,
gcDeleteSpecific,
} GCAction;
};
GCAction action{gcDeleteDead};
@ -110,7 +110,7 @@ struct SubstitutablePathInfo {
unsigned long long narSize; /* 0 = unknown */
};
typedef std::map<Path, SubstitutablePathInfo> SubstitutablePathInfos;
using SubstitutablePathInfos = std::map<Path, SubstitutablePathInfo>;
struct ValidPathInfo {
Path path;
@ -248,7 +248,7 @@ struct BuildResult {
class Store : public std::enable_shared_from_this<Store>, public Config {
public:
typedef std::map<std::string, std::string> Params;
using Params = std::map<std::string, std::string>;
const PathSetting storeDir_{this, false, settings.nixStore, "store",
"path to the Nix store"};
@ -780,12 +780,11 @@ StoreType getStoreType(const std::string& uri = settings.storeUri.get(),
std::list<ref<Store>> getDefaultSubstituters();
/* Store implementation registration. */
typedef std::function<std::shared_ptr<Store>(const std::string& uri,
const Store::Params& params)>
OpenStore;
using OpenStore = std::function<std::shared_ptr<Store>(const std::string&,
const Store::Params&)>;
struct RegisterStoreImplementation {
typedef std::vector<OpenStore> Implementations;
using Implementations = std::vector<OpenStore>;
static Implementations* implementations;
RegisterStoreImplementation(OpenStore fun) {