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

Revert "Use shared pointers in the memory source accessor"

Browse source 
This is no longer necessary.

This reverts commit 4df60e639b.
This commit is contained in:
Sergei Zimmerman 2025-09-22 01:17:00 +03:00
parent c4c92c4c61
commit 5915fe3190
No known key found for this signature in database
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libutil-tests/git.cc
View file

@ -233,30 +233,30 @@ TEST_F(GitTest, both_roundrip)
.contents{
{
"foo",
make_ref<File>(File::Regular{
File::Regular{
.contents = "hello\n\0\n\tworld!",
}),
},
},
{
"bar",
make_ref<File>(File::Directory{
File::Directory{
.contents =
{
{
"baz",
make_ref<File>(File::Regular{
File::Regular{
.executable = true,
.contents = "good day,\n\0\n\tworld!",
}),
},
},
{
"quux",
make_ref<File>(File::Symlink{
File::Symlink{
.target = "/over/there",
}),
},
},
}),
},
},
},
},
};

16
src/libutil/include/nix/util/memory-source-accessor.hh
View file

@ -35,7 +35,7 @@ struct MemorySourceAccessor : virtual SourceAccessor
{
using Name = std::string;
std::map<Name, ref<File>, std::less<>> contents;
std::map<Name, File, std::less<>> contents;
bool operator==(const Directory &) const noexcept;
// TODO libc++ 16 (used by darwin) missing `std::map::operator <=>`, can't do yet.
@ -89,21 +89,13 @@ struct MemorySourceAccessor : virtual SourceAccessor
SourcePath addFile(CanonPath path, std::string && contents);
};
inline bool
MemorySourceAccessor::File::Directory::operator==(const MemorySourceAccessor::File::Directory & other) const noexcept
{
return std::ranges::equal(contents, other.contents, [](const auto & lhs, const auto & rhs) -> bool {
return lhs.first == rhs.first && *lhs.second == *rhs.second;
});
};
inline bool MemorySourceAccessor::File::Directory::operator==(
const MemorySourceAccessor::File::Directory &) const noexcept = default;
inline bool
MemorySourceAccessor::File::Directory::operator<(const MemorySourceAccessor::File::Directory & other) const noexcept
{
return std::ranges::lexicographical_compare(
contents, other.contents, [](const auto & lhs, const auto & rhs) -> bool {
return lhs.first < rhs.first && *lhs.second < *rhs.second;
});
return contents < other.contents;
}
inline bool MemorySourceAccessor::File::operator==(const MemorySourceAccessor::File &) const noexcept = default;

6
src/libutil/memory-source-accessor.cc
View file

@ -39,11 +39,11 @@ MemorySourceAccessor::File * MemorySourceAccessor::open(const CanonPath & path,
i,
{
std::string{name},
make_ref<File>(File::Directory{}),
File::Directory{},
});
}
}
cur = &*i->second;
cur = &i->second;
}
if (newF && create)
@ -107,7 +107,7 @@ MemorySourceAccessor::DirEntries MemorySourceAccessor::readDirectory(const Canon
if (auto * d = std::get_if<File::Directory>(&f->raw)) {
DirEntries res;
for (auto & [name, file] : d->contents)
res.insert_or_assign(name, file->lstat().type);
res.insert_or_assign(name, file.lstat().type);
return res;
} else
throw Error("file '%s' is not a directory", path);