update submodules

loliGothicK · Jul 17, 2019 · d91bb80 · d91bb80
1 parent 4a04f17
commit d91bb80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/catch2 b/catch2
diff --git a/mitama-cpp-result b/mitama-cpp-result
diff --git a/tests/basic-tests/basic-tests.cpp b/tests/basic-tests/basic-tests.cpp
@@ -29,15 +29,15 @@ TEMPLATE_TEST_CASE("validates",
                    "[quantity][validate]",
                    second_t, meter_t, ampere_t, candela_t, kelvin_t, kilogram_t, mol_t)
 {
-    auto validator = [](auto v) -> mitama::Result<quantity_t<TestType, int>, int> {
+    auto validator = [](auto v) -> mitama::result<quantity_t<TestType, int>, int> {
         if (v.value() < 0)
-            return mitama::Err(v.value());
+            return mitama::failure(v.value());
         else
-            return mitama::Ok(v);
+            return mitama::success(v);
     };
 
-    REQUIRE( (1|TestType{}).validate(validator) == Ok(1|TestType{}) );
-    REQUIRE( (-1|TestType{}).validate(validator) == Err(-1) );
+    REQUIRE( (1|TestType{}).validate(validator) == mitama::success(1|TestType{}) );
+    REQUIRE( (-1|TestType{}).validate(validator) == mitama::failure(-1) );
 }
 
 #include <mitama/dimensional/systems/si/quantity.hpp>

diff --git a/tests/test_include/test_util.hpp b/tests/test_include/test_util.hpp
@@ -5,7 +5,7 @@
 #include <utility>
 #include <tuple>
 #include <random>
-#include <mitama/result/Result.hpp>
+#include <mitama/result/result.hpp>
 
 #define IS_INVALID_EXPR(...)                                     \
   IS_INVALID_EXPR_IMPL1(__VA_ARGS__)                             \
+0 −6		.circleci/config.yml
+4 −0		CMakeLists.txt
+32 −59		include/mitama/match/match.hpp
+35 −0		include/mitama/result/detail/dangling.hpp
+40 −0		include/mitama/result/detail/fwd.hpp
+132 −0		include/mitama/result/detail/meta.hpp
+517 −0		include/mitama/result/detail/result_impl.hpp
+1,551 −0		include/mitama/result/result.hpp
+24 −0		include/mitama/result/traits/Deref.hpp
+89 −0		include/mitama/result/traits/impl_traits.hpp
+1 −1		include/mitama/result/traits/perfect_traits_special_members.hpp
+0 −827		include/result/Result.hpp
+0 −60		include/result/detail/detail.hpp
+0 −18		include/result/detail/fwd.hpp
+0 −191		include/result/detail/result_impl.hpp
+0 −49		include/result/traits/impl_traits.hpp
+32 −32		test/Match_Test.cpp
+298 −194		test/Result_Test.cpp
+1 −1		test/match.cpp
+159 −159		test/special_member_tests.hpp