Cmake love (#55)

* Do CMake properly

* Remove uneeded file

* Add patch to version

* Init submodule in appveyor

* Use FetchContent

* Up CMake version requirement

* Use Xenial on Travis instead of Trusty

* Tidy traits

* Use Xenial repos

tests/swap.cpp

@@ -1,101 +1,101 @@
-#include "catch.hpp"
-#include "expected.hpp"
-
-struct no_throw {
-  no_throw(std::string i) : i(i) {}
-  std::string i;
-};
-struct canthrow_move {
-  canthrow_move(std::string i) : i(i) {}
-  canthrow_move(canthrow_move const &) = default;
-  canthrow_move(canthrow_move &&other) noexcept(false) : i(other.i) {}
-  canthrow_move &operator=(canthrow_move &&) = default;
-  std::string i;
-};
-
-bool should_throw = false;
-struct willthrow_move {
-  willthrow_move(std::string i) : i(i) {}
-  willthrow_move(willthrow_move const &) = default;
-  willthrow_move(willthrow_move &&other) : i(other.i) {
-    if (should_throw)
-      throw 0;
-  }
-  willthrow_move &operator=(willthrow_move &&) = default;
-  std::string i;
-};
-static_assert(tl::detail::is_swappable<no_throw>::value, "");
-
-template <class T1, class T2> void swap_test() {
-  std::string s1 = "abcdefghijklmnopqrstuvwxyz";
-  std::string s2 = "zyxwvutsrqponmlkjihgfedcba";
-
-  tl::expected<T1, T2> a{s1};
-  tl::expected<T1, T2> b{s2};
-  swap(a, b);
-  REQUIRE(a->i == s2);
-  REQUIRE(b->i == s1);
-
-  a = s1;
-  b = tl::unexpected<T2>(s2);
-  swap(a, b);
-  REQUIRE(a.error().i == s2);
-  REQUIRE(b->i == s1);
-
-  a = tl::unexpected<T2>(s1);
-  b = s2;
-  swap(a, b);
-  REQUIRE(a->i == s2);
-  REQUIRE(b.error().i == s1);
-
-  a = tl::unexpected<T2>(s1);
-  b = tl::unexpected<T2>(s2);
-  swap(a, b);
-  REQUIRE(a.error().i == s2);
-  REQUIRE(b.error().i == s1);
-
-  a = s1;
-  b = s2;
-  a.swap(b);
-  REQUIRE(a->i == s2);
-  REQUIRE(b->i == s1);
-
-  a = s1;
-  b = tl::unexpected<T2>(s2);
-  a.swap(b);
-  REQUIRE(a.error().i == s2);
-  REQUIRE(b->i == s1);
-
-  a = tl::unexpected<T2>(s1);
-  b = s2;
-  a.swap(b);
-  REQUIRE(a->i == s2);
-  REQUIRE(b.error().i == s1);
-
-  a = tl::unexpected<T2>(s1);
-  b = tl::unexpected<T2>(s2);
-  a.swap(b);
-  REQUIRE(a.error().i == s2);
-  REQUIRE(b.error().i == s1);
-}
-
-TEST_CASE("swap") {
-
-  swap_test<no_throw, no_throw>();
-  swap_test<no_throw, canthrow_move>();
-  swap_test<canthrow_move, no_throw>();
-
-  std::string s1 = "abcdefghijklmnopqrstuvwxyz";
-  std::string s2 = "zyxwvutsrqponmlkjihgfedcbaxxx";
-  tl::expected<no_throw, willthrow_move> a{s1};
-  tl::expected<no_throw, willthrow_move> b{tl::unexpect, s2};
-  should_throw = 1;
-
-  #ifdef _MSC_VER
-  //this seems to break catch on GCC and Clang
-  REQUIRE_THROWS(swap(a, b));
-  #endif
-
-  REQUIRE(a->i == s1);
-  REQUIRE(b.error().i == s2);
+#include "catch.hpp"
+#include <tl/expected.hpp>
+
+struct no_throw {
+  no_throw(std::string i) : i(i) {}
+  std::string i;
+};
+struct canthrow_move {
+  canthrow_move(std::string i) : i(i) {}
+  canthrow_move(canthrow_move const &) = default;
+  canthrow_move(canthrow_move &&other) noexcept(false) : i(other.i) {}
+  canthrow_move &operator=(canthrow_move &&) = default;
+  std::string i;
+};
+
+bool should_throw = false;
+struct willthrow_move {
+  willthrow_move(std::string i) : i(i) {}
+  willthrow_move(willthrow_move const &) = default;
+  willthrow_move(willthrow_move &&other) : i(other.i) {
+    if (should_throw)
+      throw 0;
+  }
+  willthrow_move &operator=(willthrow_move &&) = default;
+  std::string i;
+};
+static_assert(tl::detail::is_swappable<no_throw>::value, "");
+
+template <class T1, class T2> void swap_test() {
+  std::string s1 = "abcdefghijklmnopqrstuvwxyz";
+  std::string s2 = "zyxwvutsrqponmlkjihgfedcba";
+
+  tl::expected<T1, T2> a{s1};
+  tl::expected<T1, T2> b{s2};
+  swap(a, b);
+  REQUIRE(a->i == s2);
+  REQUIRE(b->i == s1);
+
+  a = s1;
+  b = tl::unexpected<T2>(s2);
+  swap(a, b);
+  REQUIRE(a.error().i == s2);
+  REQUIRE(b->i == s1);
+
+  a = tl::unexpected<T2>(s1);
+  b = s2;
+  swap(a, b);
+  REQUIRE(a->i == s2);
+  REQUIRE(b.error().i == s1);
+
+  a = tl::unexpected<T2>(s1);
+  b = tl::unexpected<T2>(s2);
+  swap(a, b);
+  REQUIRE(a.error().i == s2);
+  REQUIRE(b.error().i == s1);
+
+  a = s1;
+  b = s2;
+  a.swap(b);
+  REQUIRE(a->i == s2);
+  REQUIRE(b->i == s1);
+
+  a = s1;
+  b = tl::unexpected<T2>(s2);
+  a.swap(b);
+  REQUIRE(a.error().i == s2);
+  REQUIRE(b->i == s1);
+
+  a = tl::unexpected<T2>(s1);
+  b = s2;
+  a.swap(b);
+  REQUIRE(a->i == s2);
+  REQUIRE(b.error().i == s1);
+
+  a = tl::unexpected<T2>(s1);
+  b = tl::unexpected<T2>(s2);
+  a.swap(b);
+  REQUIRE(a.error().i == s2);
+  REQUIRE(b.error().i == s1);
+}
+
+TEST_CASE("swap") {
+
+  swap_test<no_throw, no_throw>();
+  swap_test<no_throw, canthrow_move>();
+  swap_test<canthrow_move, no_throw>();
+
+  std::string s1 = "abcdefghijklmnopqrstuvwxyz";
+  std::string s2 = "zyxwvutsrqponmlkjihgfedcbaxxx";
+  tl::expected<no_throw, willthrow_move> a{s1};
+  tl::expected<no_throw, willthrow_move> b{tl::unexpect, s2};
+  should_throw = 1;
+
+  #ifdef _MSC_VER
+  //this seems to break catch on GCC and Clang
+  REQUIRE_THROWS(swap(a, b));
+  #endif
+
+  REQUIRE(a->i == s1);
+  REQUIRE(b.error().i == s2);
 }