Clean up app.cc (#9201)

- Rename `expected` to `expectedType`

- Use early `return` and `continue` to reduce nesting

.gitignore

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

src/nix/app.cc

@@ -20,20 +20,24 @@ StringPairs resolveRewrites(
     const std::vector<BuiltPathWithResult> & dependencies)
 {
     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;
@@ -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)
+    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") {
         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,
         }};