diff options
| author | regnat <rg@regnat.ovh> | 2022-03-07 17:45:35 +0100 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2022-03-07 17:49:02 +0100 |
| commit | dcf4f77fac8bc214afd4851b367ce386f0a34658 (patch) | |
| tree | 9e3b607c1b0c2387ff4ef31a11ad2c975173865f /src/libexpr/eval-cache.hh | |
| parent | 313bbc07a8ae9d72c5f728fde490f3cddcc5087b (diff) | |
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.
Diffstat (limited to 'src/libexpr/eval-cache.hh')
| -rw-r--r-- | src/libexpr/eval-cache.hh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libexpr/eval-cache.hh b/src/libexpr/eval-cache.hh index c0ca76bcf..40f1d4ffc 100644 --- a/src/libexpr/eval-cache.hh +++ b/src/libexpr/eval-cache.hh @@ -3,7 +3,6 @@ #include "sync.hh" #include "hash.hh" #include "eval.hh" -#include "or-suggestions.hh" #include <functional> #include <variant> |