From 201a4af9a4447a151682de6705a4a74783bf0e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A2=D1=80=D0=BE?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BC=D0=BE=D0=B2?=
 <62882157+trofkm@users.noreply.github.com>
Date: Mon, 23 Oct 2023 01:56:46 +0300
Subject: [PATCH] Clean up `app.cc` (#9201)

- Rename `expected` to `expectedType`

- Use early `return` and `continue` to reduce nesting
---
 .gitignore     |  2 ++
 src/nix/app.cc | 40 ++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d3314015..04d96ca2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,7 +138,9 @@ nix-rust/target
 
 result
 
+# IDE
 .vscode/
+.idea/
 
 # clangd and possibly more
 .cache/
diff --git a/src/nix/app.cc b/src/nix/app.cc
index 34fac9935..935ed18ec 100644
--- a/src/nix/app.cc
+++ b/src/nix/app.cc
@@ -20,20 +20,24 @@ StringPairs resolveRewrites(
     const std::vector<BuiltPathWithResult> & dependencies)
 {
     StringPairs res;
-    if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) {
-        for (auto & dep : dependencies) {
-            if (auto drvDep = std::get_if<BuiltPathBuilt>(&dep.path)) {
-                for (auto & [ outputName, outputPath ] : drvDep->outputs) {
-                    res.emplace(
-                        DownstreamPlaceholder::fromSingleDerivedPathBuilt(
-                            SingleDerivedPath::Built {
-                                .drvPath = make_ref<SingleDerivedPath>(drvDep->drvPath->discardOutputPath()),
-                                .output = outputName,
-                            }).render(),
-                        store.printStorePath(outputPath)
-                    );
-                }
-            }
+    if (!experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) {
+        return res;
+    }
+    for (auto &dep: dependencies) {
+        auto drvDep = std::get_if<BuiltPathBuilt>(&dep.path);
+        if (!drvDep) {
+            continue;
+        }
+
+        for (const auto & [ outputName, outputPath ] : drvDep->outputs) {
+            res.emplace(
+                DownstreamPlaceholder::fromSingleDerivedPathBuilt(
+                    SingleDerivedPath::Built {
+                        .drvPath = make_ref<SingleDerivedPath>(drvDep->drvPath->discardOutputPath()),
+                        .output = outputName,
+                    }).render(),
+                store.printStorePath(outputPath)
+            );
         }
     }
     return res;
@@ -58,11 +62,11 @@ UnresolvedApp InstallableValue::toApp(EvalState & state)
 
     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")
         ? "app" : "derivation";
-    if (type != expected)
-        throw Error("attribute '%s' should have type '%s'", cursor->getAttrPathStr(), expected);
+    if (type != expectedType)
+        throw Error("attribute '%s' should have type '%s'", cursor->getAttrPathStr(), expectedType);
 
     if (type == "app") {
         auto [program, context] = cursor->getAttr("program")->getStringWithContext();
@@ -91,7 +95,7 @@ UnresolvedApp InstallableValue::toApp(EvalState & state)
             }, c.raw));
         }
 
-        return UnresolvedApp{App {
+        return UnresolvedApp { App {
             .context = std::move(context2),
             .program = program,
         }};