Merge branch 'master' into extend_moves

2 files changed, 17 insertions, 24 deletions

diff --git a/cpp/examples/move.cpp b/cpp/examples/move.cpp
new file mode 100644
index 0000000..970a65d
--- /dev/null
+++ b/cpp/examples/move.cpp
@@ -0,0 +1,17 @@
+/* A simple example showing how to move a cube and print it in H48 format. */
+
+#include "../nissy.h"
+#include <iostream>
+
+int main() {
+        nissy::cube c;
+        if (!c.move("R' U' F").ok()) {
+                std::cout << "Error moving the cube!" << std::endl;
+                return 1;
+        }
+
+        auto str = c.to_string();
+        std::cout << "Cube after R' U' F:" << std::endl << str << std::endl;
+
+        return 0;
+}
diff --git a/cpp/examples/move_convert.cpp b/cpp/examples/move_convert.cpp
deleted file mode 100644
index 11398df..0000000
--- a/cpp/examples/move_convert.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* A simple example showing how to move a cube and print it in H48 format. */
-
-#include "../nissy.h"
-#include <iostream>
-
-int main() {
-        nissy::cube c;
-        if (!c.move("R' U' F").ok()) {
-                std::cout << "Error moving the cube!" << std::endl;
-                return 1;
-        }
-
-        auto string_or_error = c.to_string("H48");
-        if (std::holds_alternative<nissy::error>(string_or_error)) {
-                std::cout << "Error converting cube!" << std::endl;
-                return 1;
-        }
-
-        auto str = std::get<std::string>(string_or_error);
-        std::cout << "Cube in H48 format after R' U' F:" << std::endl
-            << str << std::endl;
-
-        return 0;
-}