puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #9289 from edolstra/fix-warnings

Browse source 
Fix gcc warnings

(cherry picked from commit 66cb364f58)
Change-Id: I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
This commit is contained in:
eldritch horrors 2024-03-04 05:27:35 +01:00
parent 2633ca3f88
commit 6e0dd9f673
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libcmd/command.cc
View file

@ -175,7 +175,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
throw UsageError("'--all' does not expect arguments"); throw UsageError("'--all' does not expect arguments");
// XXX: Only uses opaque paths, ignores all the realisations // XXX: Only uses opaque paths, ignores all the realisations
for (auto & p : store->queryAllValidPaths()) for (auto & p : store->queryAllValidPaths())
paths.push_back(BuiltPath::Opaque{p}); paths.emplace_back(BuiltPath::Opaque{p});
} else { } else {
paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, operateOn, installables); paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, operateOn, installables);
if (recursive) { if (recursive) {
@ -188,7 +188,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
} }
store->computeFSClosure(pathsRoots, pathsClosure); store->computeFSClosure(pathsRoots, pathsClosure);
for (auto & path : pathsClosure) for (auto & path : pathsClosure)
paths.push_back(BuiltPath::Opaque{path}); paths.emplace_back(BuiltPath::Opaque{path});
} }
} }

2
src/libcmd/installables.cc
View file

@ -669,7 +669,7 @@ BuiltPaths Installable::toBuiltPaths(
BuiltPaths res; BuiltPaths res;
for (auto & drvPath : Installable::toDerivations(store, installables, true)) for (auto & drvPath : Installable::toDerivations(store, installables, true))
res.push_back(BuiltPath::Opaque{drvPath}); res.emplace_back(BuiltPath::Opaque{drvPath});
return res; return res;
} }
} }

5
src/libstore/derivations.cc
View file

@ -353,7 +353,7 @@ Derivation parseDerivation(
expect(str, "erive("); expect(str, "erive(");
version = DerivationATermVersion::Traditional; version = DerivationATermVersion::Traditional;
break; break;
case 'r': case 'r': {
expect(str, "rvWithVersion("); expect(str, "rvWithVersion(");
auto versionS = parseString(str); auto versionS = parseString(str);
if (versionS == "xp-dyn-drv") { if (versionS == "xp-dyn-drv") {
@ -366,6 +366,9 @@ Derivation parseDerivation(
expect(str, ","); expect(str, ",");
break; break;
} }
default:
throw Error("derivation does not start with 'Derive' or 'DrvWithVersion'");
}
/* Parse the list of outputs. */ /* Parse the list of outputs. */
expect(str, "["); expect(str, "[");

2
src/libstore/store-api.cc
View file

@ -815,7 +815,7 @@ void Store::substitutePaths(const StorePathSet & paths)
std::vector<DerivedPath> paths2; std::vector<DerivedPath> paths2;
for (auto & path : paths) for (auto & path : paths)
if (!path.isDerivation()) if (!path.isDerivation())
paths2.push_back(DerivedPath::Opaque{path}); paths2.emplace_back(DerivedPath::Opaque{path});
uint64_t downloadSize, narSize; uint64_t downloadSize, narSize;
StorePathSet willBuild, willSubstitute, unknown; StorePathSet willBuild, willSubstitute, unknown;
queryMissing(paths2, queryMissing(paths2,

2
src/nix-build/nix-build.cc
View file

@ -449,7 +449,7 @@ static void main_nix_build(int argc, char * * argv)
} }
} }
for (const auto & src : drv.inputSrcs) { for (const auto & src : drv.inputSrcs) {
pathsToBuild.push_back(DerivedPath::Opaque{src}); pathsToBuild.emplace_back(DerivedPath::Opaque{src});
pathsToCopy.insert(src); pathsToCopy.insert(src);
} }

4
src/nix-env/nix-env.cc
View file

@ -481,12 +481,12 @@ static void printMissing(EvalState & state, DrvInfos & elems)
std::vector<DerivedPath> targets; std::vector<DerivedPath> targets;
for (auto & i : elems) for (auto & i : elems)
if (auto drvPath = i.queryDrvPath()) if (auto drvPath = i.queryDrvPath())
targets.push_back(DerivedPath::Built{ targets.emplace_back(DerivedPath::Built{
.drvPath = makeConstantStorePathRef(*drvPath), .drvPath = makeConstantStorePathRef(*drvPath),
.outputs = OutputsSpec::All { }, .outputs = OutputsSpec::All { },
}); });
else else
targets.push_back(DerivedPath::Opaque{ targets.emplace_back(DerivedPath::Opaque{
.path = i.queryOutPath(), .path = i.queryOutPath(),
}); });