From 6e0dd9f6738f58749a9fe31cd0dfcf9fc10cdcfe Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Mon, 4 Mar 2024 05:27:35 +0100
Subject: [PATCH] Merge pull request #9289 from edolstra/fix-warnings

Fix gcc warnings

(cherry picked from commit 66cb364f581486e0c426b35149ac13d19f7842bc)
Change-Id: I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
---
 src/libcmd/command.cc       | 4 ++--
 src/libcmd/installables.cc  | 2 +-
 src/libstore/derivations.cc | 5 ++++-
 src/libstore/store-api.cc   | 2 +-
 src/nix-build/nix-build.cc  | 2 +-
 src/nix-env/nix-env.cc      | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index a88ba8134..de9f546fc 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -175,7 +175,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
             throw UsageError("'--all' does not expect arguments");
         // XXX: Only uses opaque paths, ignores all the realisations
         for (auto & p : store->queryAllValidPaths())
-            paths.push_back(BuiltPath::Opaque{p});
+            paths.emplace_back(BuiltPath::Opaque{p});
     } else {
         paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, operateOn, installables);
         if (recursive) {
@@ -188,7 +188,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
             }
             store->computeFSClosure(pathsRoots, pathsClosure);
             for (auto & path : pathsClosure)
-                paths.push_back(BuiltPath::Opaque{path});
+                paths.emplace_back(BuiltPath::Opaque{path});
         }
     }
 
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index eb1903084..a9d25671c 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -669,7 +669,7 @@ BuiltPaths Installable::toBuiltPaths(
 
         BuiltPaths res;
         for (auto & drvPath : Installable::toDerivations(store, installables, true))
-            res.push_back(BuiltPath::Opaque{drvPath});
+            res.emplace_back(BuiltPath::Opaque{drvPath});
         return res;
     }
 }
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index fc17e520c..7ea4d50e6 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -353,7 +353,7 @@ Derivation parseDerivation(
         expect(str, "erive(");
         version = DerivationATermVersion::Traditional;
         break;
-    case 'r':
+    case 'r': {
         expect(str, "rvWithVersion(");
         auto versionS = parseString(str);
         if (versionS == "xp-dyn-drv") {
@@ -366,6 +366,9 @@ Derivation parseDerivation(
         expect(str, ",");
         break;
     }
+    default:
+        throw Error("derivation does not start with 'Derive' or 'DrvWithVersion'");
+    }
 
     /* Parse the list of outputs. */
     expect(str, "[");
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index b15765b73..2851133d4 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -815,7 +815,7 @@ void Store::substitutePaths(const StorePathSet & paths)
     std::vector<DerivedPath> paths2;
     for (auto & path : paths)
         if (!path.isDerivation())
-            paths2.push_back(DerivedPath::Opaque{path});
+            paths2.emplace_back(DerivedPath::Opaque{path});
     uint64_t downloadSize, narSize;
     StorePathSet willBuild, willSubstitute, unknown;
     queryMissing(paths2,
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index e62c4f6b1..60bc08146 100644
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -449,7 +449,7 @@ static void main_nix_build(int argc, char * * argv)
             }
         }
         for (const auto & src : drv.inputSrcs) {
-            pathsToBuild.push_back(DerivedPath::Opaque{src});
+            pathsToBuild.emplace_back(DerivedPath::Opaque{src});
             pathsToCopy.insert(src);
         }
 
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index d0ec206a9..d69d516c3 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -481,12 +481,12 @@ static void printMissing(EvalState & state, DrvInfos & elems)
     std::vector<DerivedPath> targets;
     for (auto & i : elems)
         if (auto drvPath = i.queryDrvPath())
-            targets.push_back(DerivedPath::Built{
+            targets.emplace_back(DerivedPath::Built{
                 .drvPath = makeConstantStorePathRef(*drvPath),
                 .outputs = OutputsSpec::All { },
             });
         else
-            targets.push_back(DerivedPath::Opaque{
+            targets.emplace_back(DerivedPath::Opaque{
                 .path = i.queryOutPath(),
             });