update some tests

.clang-format

@@ -1,6 +1,6 @@
 ---
 Language:     Cpp
-Standard:     c++17
+Standard:     Cpp11
 BasedOnStyle: Chromium
 
 AccessModifierOffset: -4

test/utils/asserts.cpp

@@ -9,12 +9,12 @@ namespace fizzy
 {
 std::ostream& operator<<(std::ostream& os, execution_result result)
 {
-    if (result.trapped)
+    if (result.trapped())
         return os << "trapped";
 
     os << "result(";
-    if (result.result.has_value())
-        os << *result.result;
+    if (result.has_value())
+        os << result.value();
     os << ")";
     return os;
 }

test/utils/asserts.hpp

@@ -10,17 +10,17 @@
 
 MATCHER(Traps, "")  // NOLINT(readability-redundant-string-init)
 {
-    return arg.trapped;
+    return arg.trapped();
 }
 
 MATCHER(Result, "empty result")
 {
-    return !arg.trapped && !arg.result.has_value();
+    return !arg.trapped() && !arg.has_value();
 }
 
 MATCHER_P(Result, value, "")  // NOLINT(readability-redundant-string-init)
 {
-    return !arg.trapped && arg.result.has_value() && *arg.result == uint64_t(value);
+    return !arg.trapped() && arg.has_value() && arg.value() == uint64_t(value);
 }
 
 #define EXPECT_THROW_MESSAGE(stmt, ex_type, expected)                                        \

test/utils/fizzy_engine.cpp

@@ -57,7 +57,7 @@ fizzy::execution_result env_adler32(fizzy::Instance& instance, std::vector<uint6
 {
     assert(instance.memory != nullptr);
     const auto ret = fizzy::test::adler32(bytes_view{*instance.memory}.substr(args[0], args[1]));
-    return {false, {ret}};
+    return {fizzy::execution_result::status::WithResult, ret};
 }
 }  // namespace
 
@@ -133,8 +133,9 @@ std::optional<WasmEngine::FuncRef> FizzyEngine::find_function(
 WasmEngine::Result FizzyEngine::execute(
     WasmEngine::FuncRef func_ref, const std::vector<uint64_t>& args)
 {
-    const auto [trapped, result] =
-        fizzy::execute(*m_instance, static_cast<uint32_t>(func_ref), args);
-    return {trapped, result};
+    const auto status = fizzy::execute(*m_instance, static_cast<uint32_t>(func_ref), args);
+    if (status.trapped())
+        return {true, 0};
+    return {false, status.value()};
 }
 }  // namespace fizzy::test