nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-21 22:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up app.cc (#9201)

Browse Source 
- Rename `expected` to `expectedType`

- Use early `return` and `continue` to reduce nesting
This commit is contained in:
Кирилл Трофимов 2023-10-23 01:56:46 +03:00 committed by GitHub
parent edc07588ec
commit 201a4af9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -138,7 +138,9 @@ nix-rust/target
result result
# IDE
.vscode/ .vscode/
.idea/
# clangd and possibly more # clangd and possibly more
.cache/ .cache/

40
src/nix/app.cc
View File

@ -20,20 +20,24 @@ StringPairs resolveRewrites(
const std::vector<BuiltPathWithResult> & dependencies) const std::vector<BuiltPathWithResult> & dependencies)
{ {
StringPairs res; StringPairs res;
if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) { if (!experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) {
for (auto & dep : dependencies) { return res;
if (auto drvDep = std::get_if<BuiltPathBuilt>(&dep.path)) { }
for (auto & [ outputName, outputPath ] : drvDep->outputs) { for (auto &dep: dependencies) {
res.emplace( auto drvDep = std::get_if<BuiltPathBuilt>(&dep.path);
DownstreamPlaceholder::fromSingleDerivedPathBuilt( if (!drvDep) {
SingleDerivedPath::Built { continue;
.drvPath = make_ref<SingleDerivedPath>(drvDep->drvPath->discardOutputPath()), }
.output = outputName,
}).render(), for (const auto & [ outputName, outputPath ] : drvDep->outputs) {
store.printStorePath(outputPath) res.emplace(
); DownstreamPlaceholder::fromSingleDerivedPathBuilt(
} SingleDerivedPath::Built {
} .drvPath = make_ref<SingleDerivedPath>(drvDep->drvPath->discardOutputPath()),
.output = outputName,
}).render(),
store.printStorePath(outputPath)
);
} }
} }
return res; return res;
@ -58,11 +62,11 @@ UnresolvedApp InstallableValue::toApp(EvalState & state)
auto type = cursor->getAttr("type")->getString(); auto type = cursor->getAttr("type")->getString();
std::string expected = !attrPath.empty() && std::string expectedType = !attrPath.empty() &&
(state.symbols[attrPath[0]] == "apps" || state.symbols[attrPath[0]] == "defaultApp") (state.symbols[attrPath[0]] == "apps" || state.symbols[attrPath[0]] == "defaultApp")
? "app" : "derivation"; ? "app" : "derivation";
if (type != expected) if (type != expectedType)
throw Error("attribute '%s' should have type '%s'", cursor->getAttrPathStr(), expected); throw Error("attribute '%s' should have type '%s'", cursor->getAttrPathStr(), expectedType);
if (type == "app") { if (type == "app") {
auto [program, context] = cursor->getAttr("program")->getStringWithContext(); auto [program, context] = cursor->getAttr("program")->getStringWithContext();
@ -91,7 +95,7 @@ UnresolvedApp InstallableValue::toApp(EvalState & state)
}, c.raw)); }, c.raw));
} }
return UnresolvedApp{App { return UnresolvedApp { App {
.context = std::move(context2), .context = std::move(context2),
.program = program, .program = program,
}}; }};