wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Fix build to use CanonPath in new FSO sinks

Browse source
This commit is contained in:
Robert Hensing 2024-07-11 12:14:48 +02:00
parent 86420753ec
commit 4fd8f19ecf
6 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/unit/libutil-support/tests/tracing-file-system-object-sink.cc
View file

@ -3,13 +3,14 @@
namespace nix::test {
void TracingFileSystemObjectSink::createDirectory(const Path & path)
void TracingFileSystemObjectSink::createDirectory(const CanonPath & path)
{
std::cerr << "createDirectory(" << path << ")\n";
sink.createDirectory(path);
}
void TracingFileSystemObjectSink::createRegularFile(const Path & path, std::function<void(CreateRegularFileSink &)> fn)
void TracingFileSystemObjectSink::createRegularFile(
const CanonPath & path, std::function<void(CreateRegularFileSink &)> fn)
{
std::cerr << "createRegularFile(" << path << ")\n";
sink.createRegularFile(path, [&](CreateRegularFileSink & crf) {
@ -18,13 +19,13 @@ void TracingFileSystemObjectSink::createRegularFile(const Path & path, std::func
});
}
void TracingFileSystemObjectSink::createSymlink(const Path & path, const std::string & target)
void TracingFileSystemObjectSink::createSymlink(const CanonPath & path, const std::string & target)
{
std::cerr << "createSymlink(" << path << ", target: " << target << ")\n";
sink.createSymlink(path, target);
}
void TracingExtendedFileSystemObjectSink::createHardlink(const Path & path, const CanonPath & target)
void TracingExtendedFileSystemObjectSink::createHardlink(const CanonPath & path, const CanonPath & target)
{
std::cerr << "createHardlink(" << path << ", target: " << target << ")\n";
sink.createHardlink(path, target);

8
tests/unit/libutil-support/tests/tracing-file-system-object-sink.hh
View file

@ -15,11 +15,11 @@ public:
{
}
void createDirectory(const Path & path) override;
void createDirectory(const CanonPath & path) override;
void createRegularFile(const Path & path, std::function<void(CreateRegularFileSink &)> fn);
void createRegularFile(const CanonPath & path, std::function<void(CreateRegularFileSink &)> fn) override;
void createSymlink(const Path & path, const std::string & target);
void createSymlink(const CanonPath & path, const std::string & target) override;
};
/**
@ -35,7 +35,7 @@ public:
{
}
void createHardlink(const Path & path, const CanonPath & target);
void createHardlink(const CanonPath & path, const CanonPath & target) override;
};
}