1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00

Merge or-suggestions.hh into suggestions.hh

No real need for keeping a separate header for such a simple class.

This requires changing a bit `OrSuggestions<T>::operator*` to not throw
an `Error` to prevent a cyclic dependency. But since this error is only
thrown on programmer error, we can replace the whole method by a direct
call to `std::get` which will raise its own assertion if needs be.
This commit is contained in:
regnat 2022-03-07 17:45:35 +01:00
parent 313bbc07a8
commit dcf4f77fac
3 changed files with 57 additions and 65 deletions

View file

@ -3,7 +3,6 @@
#include "sync.hh"
#include "hash.hh"
#include "eval.hh"
#include "or-suggestions.hh"
#include <functional>
#include <variant>