Revert "Remove some designated initializers"

This reverts commit ee9eb83a84.
This commit is contained in:
John Ericson 2023-02-28 11:57:20 -05:00
parent 123b11ff83
commit 85bb865d20
16 changed files with 21 additions and 21 deletions

View File

@ -300,7 +300,7 @@ SV * makeFixedOutputPath(int recursive, char * algo, char * hash, char * name)
.method = method,
.hash = h,
},
/* .references = */ {},
.references = {},
});
XPUSHs(sv_2mortal(newSVpv(store()->printStorePath(path).c_str(), 0)));
} catch (Error & e) {

View File

@ -1287,7 +1287,7 @@ drvName, Bindings * attrs, Value & v)
.method = method,
.hash = h,
},
/* .references = */ {},
.references = {},
});
drv.env["out"] = state.store->printStorePath(outPath);
drv.outputs.insert_or_assign("out",
@ -2103,7 +2103,7 @@ static void addPath(
.method = method,
.hash = *expectedHash,
},
/* .references = */ {},
.references = {},
});
if (!expectedHash || !state.store->isValidPath(*expectedStorePath)) {

View File

@ -250,7 +250,7 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v
.method = unpack ? FileIngestionMethod::Recursive : FileIngestionMethod::Flat,
.hash = *expectedHash,
},
/* .references = */ {}
.references = {}
});
if (state.store->isValidPath(expectedPath)) {

View File

@ -215,7 +215,7 @@ StorePath Input::computeStorePath(Store & store) const
.method = FileIngestionMethod::Recursive,
.hash = *narHash,
},
/* .references = */ {},
.references = {},
});
}

View File

@ -78,7 +78,7 @@ DownloadFileResult downloadFile(
.method = FileIngestionMethod::Flat,
.hash = hash,
},
/* .references = */ {},
.references = {},
},
hashString(htSHA256, sink.s),
};

View File

@ -313,7 +313,7 @@ StorePath BinaryCacheStore::addToStoreFromDump(Source & dump, std::string_view n
.method = method,
.hash = nar.first,
},
/* .references = */ {
.references = {
.others = references,
.self = false,
},
@ -431,7 +431,7 @@ StorePath BinaryCacheStore::addToStore(
.method = method,
.hash = h,
},
/* .references = */ {
.references = {
.others = references,
.self = false,
},

View File

@ -2446,7 +2446,7 @@ DrvOutputs LocalDerivationGoal::registerOutputs()
.method = outputHash.method,
.hash = got,
},
/* .references = */ rewriteRefs(),
.references = rewriteRefs(),
},
Hash::dummy,
};

View File

@ -167,13 +167,13 @@ ContentAddressWithReferences caWithoutRefs(const ContentAddress & ca) {
[&](const TextHash & h) -> ContentAddressWithReferences {
return TextInfo {
h,
/* .references = */ {},
.references = {},
};
},
[&](const FixedOutputHash & h) -> ContentAddressWithReferences {
return FixedOutputInfo {
h,
/* .references = */ {},
.references = {},
};
},
}, ca);

View File

@ -1419,7 +1419,7 @@ StorePath LocalStore::addToStoreFromDump(Source & source0, std::string_view name
.method = method,
.hash = hash,
},
/* .references = */ {
.references = {
.others = references,
.self = false,
},

View File

@ -56,7 +56,7 @@ std::map<StorePath, StorePath> makeContentAddressed(
.method = FileIngestionMethod::Recursive,
.hash = narModuloHash,
},
/* .references = */ std::move(refs),
.references = std::move(refs),
},
Hash::dummy,
};

View File

@ -31,7 +31,7 @@ std::optional<ContentAddressWithReferences> ValidPathInfo::contentAddressWithRef
assert(references.count(path) == 0);
return TextInfo {
th,
/* .references = */ references,
.references = references,
};
},
[&](const FixedOutputHash & foh) -> ContentAddressWithReferences {
@ -43,7 +43,7 @@ std::optional<ContentAddressWithReferences> ValidPathInfo::contentAddressWithRef
}
return FixedOutputInfo {
foh,
/* .references = */ {
.references = {
.others = std::move(refs),
.self = hasSelfReference,
},

View File

@ -236,7 +236,7 @@ std::pair<StorePath, Hash> Store::computeStorePathForPath(std::string_view name,
.method = method,
.hash = h,
},
/* .references = */ {},
.references = {},
};
return std::make_pair(makeFixedOutputPath(name, caInfo), h);
}
@ -445,7 +445,7 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
.method = method,
.hash = hash,
},
/* .references = */ {},
.references = {},
},
narHash,
};

View File

@ -220,7 +220,7 @@ static void opPrintFixedPath(Strings opFlags, Strings opArgs)
.method = method,
.hash = Hash::parseAny(hash, hashAlgo),
},
/* .references = */ {},
.references = {},
})));
}

View File

@ -49,7 +49,7 @@ struct CmdAddToStore : MixDryRun, StoreCommand
.method = std::move(ingestionMethod),
.hash = std::move(hash),
},
/* .references = */ {},
.references = {},
},
narHash,
};

View File

@ -72,7 +72,7 @@ std::tuple<StorePath, Hash> prefetchFile(
.method = ingestionMethod,
.hash = *expectedHash,
},
/* .references = */ {},
.references = {},
});
if (store->isValidPath(*storePath))
hash = expectedHash;

View File

@ -207,7 +207,7 @@ struct ProfileManifest
.method = FileIngestionMethod::Recursive,
.hash = narHash,
},
/* .references = */ {
.references = {
.others = std::move(references),
.self = false,
},