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

style(tvix): Replace remaining typedefs with using statements

Browse source 
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:
Vincent Ambo 2020-08-21 03:23:04 +01:00 • committed by tazjin
parent 674d921202
commit 7edbe59c6c
16 changed files with 48 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -32,14 +32,14 @@
using namespace nix;
using std::cout;
typedef enum {
using InstallSourceType = enum {
srcNixExprDrvs,
srcNixExprs,
srcStorePaths,
srcProfile,
srcAttrPath,
srcUnknown
} InstallSourceType;
};
struct InstallSourceInfo {
InstallSourceType type;
@ -229,7 +229,7 @@ static DrvInfos filterBySelector(EvalState& state, const DrvInfos& allElems,
std::set<unsigned int> done;
for (auto& i : selectors) {
typedef std::list<std::pair<DrvInfo, unsigned int> > Matches;
using Matches = std::list<std::pair<DrvInfo, unsigned int> >;
Matches matches;
unsigned int n = 0;
for (auto j = allElems.begin(); j != allElems.end(); ++j, ++n) {
@ -249,7 +249,7 @@ static DrvInfos filterBySelector(EvalState& state, const DrvInfos& allElems,
arbitrarily pick the first one. */
if (newestOnly) {
/* Map from package names to derivations. */
typedef std::map<std::string, std::pair<DrvInfo, unsigned int> > Newest;
using Newest = std::map<std::string, std::pair<DrvInfo, unsigned int> >;
Newest newest;
StringSet multiple;
@ -834,7 +834,7 @@ void printTable(Table& table) {
least one element with a higher version in the set. `cvUnavail'
means that there are no elements with the same name in the set. */
typedef enum { cvLess, cvEqual, cvGreater, cvUnavail } VersionDiff;
using VersionDiff = enum { cvLess, cvEqual, cvGreater, cvUnavail };
static VersionDiff compareVersionAgainstSet(const DrvInfo& elem,
const DrvInfos& elems,