wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 12:21:48 +02:00
Code Activity

Remove comparator.hh and switch to <=> in a bunch of places

Browse source 
Known behavior changes:

- `MemorySourceAccessor`'s comparison operators no longer forget to
  compare the `SourceAccessor` base class.

Progress on #10832

What remains for that issue is hopefully much easier!
This commit is contained in:
John Ericson 2024-05-16 18:46:38 -04:00
parent 2a95a2d780
commit bc83b9dc1f
49 changed files with 300 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/libutil/memory-source-accessor.hh
View file

@ -15,11 +15,15 @@ struct MemorySourceAccessor : virtual SourceAccessor
* defining what a "file system object" is in Nix.
*/
struct File {
bool operator == (const File &) const noexcept;
std::strong_ordering operator <=> (const File &) const noexcept;
struct Regular {
bool executable = false;
std::string contents;
GENERATE_CMP(Regular, me->executable, me->contents);
bool operator == (const Regular &) const = default;
auto operator <=> (const Regular &) const = default;
};
struct Directory {
@ -27,13 +31,16 @@ struct MemorySourceAccessor : virtual SourceAccessor
std::map<Name, File, std::less<>> contents;
GENERATE_CMP(Directory, me->contents);
bool operator == (const Directory &) const noexcept;
// TODO libc++ 16 (used by darwin) missing `std::map::operator <=>`, can't do yet.
bool operator < (const Directory &) const noexcept;
};
struct Symlink {
std::string target;
GENERATE_CMP(Symlink, me->target);
bool operator == (const Symlink &) const = default;
auto operator <=> (const Symlink &) const = default;
};
using Raw = std::variant<Regular, Directory, Symlink>;
@ -41,14 +48,15 @@ struct MemorySourceAccessor : virtual SourceAccessor
MAKE_WRAPPER_CONSTRUCTOR(File);
GENERATE_CMP(File, me->raw);
Stat lstat() const;
};
File root { File::Directory {} };
GENERATE_CMP(MemorySourceAccessor, me->root);
bool operator == (const MemorySourceAccessor &) const noexcept = default;
bool operator < (const MemorySourceAccessor & other) const noexcept {
return root < other.root;
}
std::string readFile(const CanonPath & path) override;
bool pathExists(const CanonPath & path) override;
@ -72,6 +80,20 @@ struct MemorySourceAccessor : virtual SourceAccessor
SourcePath addFile(CanonPath path, std::string && contents);
};
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 contents < other.contents;
}
inline bool MemorySourceAccessor::File::operator == (
const MemorySourceAccessor::File &) const noexcept = default;
inline std::strong_ordering MemorySourceAccessor::File::operator <=> (
const MemorySourceAccessor::File &) const noexcept = default;
/**
* Write to a `MemorySourceAccessor` at the given path
*/