style(tvix): Replace remaining typedefs with using statements
Change (mostly) created via: fd . -e hh -e cc | parallel clang-tidy -p ~/builds/nix --fix "'--checks=-*,modernize-use-using'" Change-Id: I90ad6e64a5399f2005dfb9956074ec51c2c78cea Reviewed-on: https://cl.tvl.fyi/c/depot/+/1830 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
parent
674d921202
commit
7edbe59c6c
16 changed files with 48 additions and 45 deletions
|
|
@ -120,7 +120,7 @@ static void createLinks(const Path& srcDir, const Path& dstDir, int priority) {
|
|||
}
|
||||
}
|
||||
|
||||
typedef std::set<Path> FileProp;
|
||||
using FileProp = std::set<Path>;
|
||||
|
||||
static FileProp done;
|
||||
static FileProp postponed = FileProp{};
|
||||
|
|
@ -158,7 +158,7 @@ struct Package {
|
|||
: path{path}, active{active}, priority{priority} {}
|
||||
};
|
||||
|
||||
typedef std::vector<Package> Packages;
|
||||
using Packages = std::vector<Package>;
|
||||
|
||||
void builtinBuildenv(const BasicDerivation& drv) {
|
||||
auto getAttr = [&](const std::string& name) {
|
||||
|
|
|
|||
2
third_party/nix/src/libstore/derivations.hh
vendored
2
third_party/nix/src/libstore/derivations.hh
vendored
|
|
@ -112,7 +112,7 @@ extern DrvHashes drvHashes; // FIXME: global, not thread-safe
|
|||
/* Split a string specifying a derivation and a set of outputs
|
||||
(/nix/store/hash-foo!out1,out2,...) into the derivation path and
|
||||
the outputs. */
|
||||
typedef std::pair<std::string, std::set<std::string> > DrvPathWithOutputs;
|
||||
using DrvPathWithOutputs = std::pair<std::string, std::set<std::string> >;
|
||||
DrvPathWithOutputs parseDrvPathWithOutputs(absl::string_view path);
|
||||
|
||||
Path makeDrvPathWithOutputs(const Path& drvPath,
|
||||
|
|
|
|||
8
third_party/nix/src/libstore/local-store.hh
vendored
8
third_party/nix/src/libstore/local-store.hh
vendored
|
|
@ -172,7 +172,7 @@ class LocalStore : public LocalFSStore {
|
|||
|
||||
private:
|
||||
typedef std::shared_ptr<AutoCloseFD> FDPtr;
|
||||
typedef std::list<FDPtr> FDs;
|
||||
using FDs = std::list<FDPtr>;
|
||||
|
||||
void findTempRoots(FDs& fds, Roots& roots, bool censor);
|
||||
|
||||
|
|
@ -270,7 +270,7 @@ class LocalStore : public LocalFSStore {
|
|||
|
||||
void checkDerivationOutputs(const Path& drvPath, const Derivation& drv);
|
||||
|
||||
typedef std::unordered_set<ino_t> InodeHash;
|
||||
using InodeHash = std::unordered_set<ino_t>;
|
||||
|
||||
InodeHash loadInodeHash();
|
||||
static Strings readDirectoryIgnoringInodes(const Path& path,
|
||||
|
|
@ -295,8 +295,8 @@ class LocalStore : public LocalFSStore {
|
|||
friend class SubstitutionGoal;
|
||||
};
|
||||
|
||||
typedef std::pair<dev_t, ino_t> Inode;
|
||||
typedef std::set<Inode> InodesSeen;
|
||||
using Inode = std::pair<dev_t, ino_t>;
|
||||
using InodesSeen = std::set<Inode>;
|
||||
|
||||
/* "Fix", or canonicalise, the meta-data of the files in a store path
|
||||
after it has been built. In particular:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace nix {
|
|||
#define GET_PROTOCOL_MAJOR(x) ((x)&0xff00)
|
||||
#define GET_PROTOCOL_MINOR(x) ((x)&0x00ff)
|
||||
|
||||
typedef enum {
|
||||
using ServeCommand = enum {
|
||||
cmdQueryValidPaths = 1,
|
||||
cmdQueryPathInfos = 2,
|
||||
cmdDumpStorePath = 3,
|
||||
|
|
@ -19,6 +19,6 @@ typedef enum {
|
|||
cmdQueryClosure = 7,
|
||||
cmdBuildDerivation = 8,
|
||||
cmdAddToStoreNar = 9,
|
||||
} ServeCommand;
|
||||
};
|
||||
|
||||
} // namespace nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue