nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity

refactor(libstore/find-cycles): use std::filesystem::path operator/

Browse source 
Replace string concatenation for path joining with type-safe
`std::filesystem::path operator/`.
This commit is contained in:
Bernardo Meurer Costa 2025-10-11 20:21:44 +00:00
parent 18bf16ee76
commit c70df0a2da
No known key found for this signature in database
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build/find-cycles.cc
View file

@ -106,12 +106,14 @@ void scanForCycleEdges2(const std::string & path, CycleEdgeScanSink & sink)
std::string name(entryName); std::string name(entryName);
size_t pos = entryName.find(caseHackSuffix); size_t pos = entryName.find(caseHackSuffix);
if (pos != std::string::npos) { if (pos != std::string::npos) {
debug("removing case hack suffix from '%s'", path + "/" + entryName); debug("removing case hack suffix from '%s'", (fsPath / entryName).string());
name.erase(pos); name.erase(pos);
} }
if (unhacked.find(name) != unhacked.end()) { if (unhacked.find(name) != unhacked.end()) {
throw Error( throw Error(
"file name collision between '%1%' and '%2%'", path + "/" + unhacked[name], path + "/" + entryName); "file name collision between '%1%' and '%2%'",
(fsPath / unhacked[name]).string(),
(fsPath / entryName).string());
} }
unhacked[name] = entryName; unhacked[name] = entryName;
#else #else
@ -121,7 +123,7 @@ void scanForCycleEdges2(const std::string & path, CycleEdgeScanSink & sink)
for (auto & [name, actualName] : unhacked) { for (auto & [name, actualName] : unhacked) {
debug("scanForCycleEdges2: recursing into %s/%s", path, actualName); debug("scanForCycleEdges2: recursing into %s/%s", path, actualName);
scanForCycleEdges2(path + "/" + actualName, sink); scanForCycleEdges2((fsPath / actualName).string(), sink);
} }
} else if (std::filesystem::is_symlink(status)) { } else if (std::filesystem::is_symlink(status)) {
// Handle symlinks - stream link target into sink // Handle symlinks - stream link target into sink