chore: rename rustify to rs-cpp

Dockerfile

@@ -18,7 +18,7 @@ COPY .git .
 COPY Makefile .
 COPY include ./include/
 COPY lib ./lib/
-COPY rustify ./rustify/
+COPY rs-cpp ./rs-cpp/
 COPY src ./src/
 RUN make BUILD=release install
 

Makefile

@@ -23,7 +23,7 @@ CUSTOM_CXXFLAGS := $(shell grep -m1 cxxflags cabin.toml | sed 's/cxxflags = \[//
 
 # Git dependency versions
 TOML11_VER := $(shell grep -m1 toml11 cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
-RESULT_VER := $(shell grep -m1 cpp-result rustify/cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
+RESULT_VER := $(shell grep -m1 cpp-result rs-cpp/cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
 
 GIT_DEPS   := $(O)/DEPS/toml11 $(O)/DEPS/mitama-cpp-result
 
@@ -44,7 +44,7 @@ DEFINES := -DCABIN_CABIN_PKG_VERSION='"$(VERSION)"' \
   -DCABIN_CABIN_COMMIT_HASH='"$(COMMIT_HASH)"' \
   -DCABIN_CABIN_COMMIT_SHORT_HASH='"$(COMMIT_SHORT_HASH)"' \
   -DCABIN_CABIN_COMMIT_DATE='"$(COMMIT_DATE)"'
-INCLUDES := -Iinclude -Isrc -Irustify/include -isystem $(O)/DEPS/toml11/include \
+INCLUDES := -Iinclude -Isrc -Irs-cpp/include -isystem $(O)/DEPS/toml11/include \
   -isystem $(O)/DEPS/mitama-cpp-result/include
 
 CXXFLAGS := -std=c++$(EDITION) -fdiagnostics-color $(CUSTOM_CXXFLAGS) \

cabin.toml

@@ -18,7 +18,7 @@ libcurl = {version = ">=7.79.1 && <9", system = true}
 libgit2 = {version = ">=1.7 && <1.10", system = true}
 nlohmann_json = {version = "3.10.5", system = true}
 tbb = {version = ">=2021.5.0 && <2023.0.0", system = true}
-rustify = {path = "rustify"}
+rs-cpp = {path = "./rs-cpp"}
 
 [dev-dependencies]
 boost-ut = {git = "https://github.com/boost-ext/ut.git", tag = "v2.3.1"}

include/Algos.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <algorithm>
 #include <cstddef>
 #include <optional>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>

include/Builder/BuildGraph.hpp

@@ -7,11 +7,11 @@
 #include "Builder/SourceLayout.hpp"
 #include "Command.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdint>
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <tbb/spin_mutex.h>

include/Builder/Compiler.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 #include "VersionReq.hpp"
 
 #include <filesystem>
 #include <fmt/format.h>
 #include <fmt/std.h>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>

include/Builder/DepGraph.hpp

@@ -3,10 +3,10 @@
 #include "Builder/BuildGraph.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <utility>
 
 namespace cabin {

include/Command.hpp

@@ -1,11 +1,10 @@
 #pragma once
 
-#include "Rustify/Result.hpp"
-
 #include <cstdint>
 #include <cstdlib>
 #include <filesystem>
 #include <fmt/format.h>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>

include/Dependency.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "Builder/Compiler.hpp"
-#include "Rustify/Result.hpp"
 #include "VersionReq.hpp"
 
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <utility>
 #include <variant>

include/Manifest.hpp

@@ -3,14 +3,14 @@
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
 #include "Dependency.hpp"
-#include "Rustify/Result.hpp"
 #include "Semver.hpp"
 
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <toml.hpp>

include/Semver.hpp

@@ -9,12 +9,11 @@
 //   ident      ::= [a-zA-Z0-9][a-zA-Z0-9-]*
 #pragma once
 
-#include "Rustify/Result.hpp"
-
 #include <cstddef>
 #include <cstdint>
 #include <fmt/ostream.h>
 #include <ostream>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>

lib/Algos.cc

@@ -1,12 +1,12 @@
 #include "Algos.hpp"
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cctype>
 #include <chrono>
 #include <cstdlib>
 #include <optional>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
@@ -89,10 +89,9 @@ bool commandExists(const std::string_view cmd) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
 #  include <array>
 #  include <limits>
+#  include <rs/tests.hpp>
 
 namespace tests {
 

lib/Builder/Compiler.cc

@@ -2,13 +2,13 @@
 
 #include "Algos.hpp"
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <array>
 #include <cctype>
 #include <cstdint>
 #include <cstdlib>
 #include <optional>
+#include <rs/result.hpp>
 #include <sstream>
 #include <string>
 #include <string_view>
@@ -369,7 +369,7 @@ std::string Compiler::detectArchiver(const bool useLTO) const {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 

lib/Command.cc

@@ -1,13 +1,12 @@
 #include "Command.hpp"
 
-#include "Rustify/Result.hpp"
-
 #include <algorithm>
 #include <array>
 #include <cstdio>
 #include <cstdlib>
 #include <fcntl.h>
 #include <fmt/format.h>
+#include <rs/result.hpp>
 #include <string>
 #include <sys/select.h>
 #include <sys/wait.h>

lib/Manifest.cc

@@ -2,7 +2,6 @@
 
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
-#include "Rustify/Result.hpp"
 #include "Semver.hpp"
 #include "TermColor.hpp"
 #include "VersionReq.hpp"
@@ -14,6 +13,7 @@
 #include <fmt/core.h>
 #include <optional>
 #include <ranges>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
@@ -674,10 +674,9 @@ Result<void> validatePackageName(const std::string_view name) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
 #  include <climits>
 #  include <fmt/ranges.h>
+#  include <rs/tests.hpp>
 #  include <toml11/fwd/literal_fwd.hpp>
 
 namespace tests {

lib/Semver.cc

@@ -436,7 +436,7 @@ Result<Version> Version::parse(const std::string_view str) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 

lib/VersionReq.cc

@@ -1,11 +1,10 @@
 #include "VersionReq.hpp"
 
-#include "Rustify/Result.hpp"
-
 #include <cctype>
 #include <cstddef>
 #include <cstdint>
 #include <ostream>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -848,8 +847,7 @@ std::ostream& operator<<(std::ostream& os, const VersionReq& req) {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
+#  include <rs/tests.hpp>
 #  include <source_location>
 #  include <span>
 

rustify/cabin.toml → rs-cpp/cabin.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rustify"
+name = "rs-cpp"
 version = "0.1.0"
 edition = "23"
 

rs-cpp/include/rs.hpp

@@ -0,0 +1,7 @@
+#ifndef RS_HPP
+#define RS_HPP
+
+#include <rs/result.hpp>
+#include <rs/tests.hpp>
+
+#endif // RS_HPP

rustify/include/Rustify/Result.hpp → rs-cpp/include/rs/result.hpp

@@ -1,23 +1,20 @@
-#pragma once
+#ifndef RS_RESULT_HPP
+#define RS_RESULT_HPP
 
-#include <exception>
-#include <fmt/core.h>
 #include <memory>
 #include <mitama/anyhow/anyhow.hpp>
 #include <mitama/result/result.hpp>
-#include <string>
-#include <string_view>
 #include <type_traits>
 #include <utility>
 
-namespace anyhow = mitama::anyhow;
-
 // NOLINTBEGIN(readability-identifier-naming,cppcoreguidelines-macro-usage)
 
 #define Try(...) MITAMA_TRY(__VA_ARGS__)
 #define Bail(...) MITAMA_BAIL(__VA_ARGS__)
 #define Ensure(...) MITAMA_ENSURE(__VA_ARGS__)
 
+namespace anyhow = mitama::anyhow;
+
 // FIXME: shared_ptr is an implementation detail. Upstream the fix.
 using AnyhowErr = mitama::failure_t<std::shared_ptr<anyhow::error>>;
 
@@ -48,3 +45,5 @@ inline constexpr auto to_anyhow = [](auto... xs) {
 };
 
 // NOLINTEND(readability-identifier-naming,cppcoreguidelines-macro-usage)
+
+#endif // RS_RESULT_HPP

rustify/include/Rustify/Tests.hpp → rs-cpp/include/rs/tests.hpp

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef RS_TESTS_HPP
+#define RS_TESTS_HPP
 
 #include <concepts>
 #include <cstddef>
@@ -215,3 +216,5 @@ assertLt(Lhs&& lhs, Rhs&& rhs, const std::string_view msg = "",
 }
 
 } // namespace tests
+
+#endif // RS_TESTS_HPP

src/Builder/Builder.hpp

@@ -3,10 +3,10 @@
 #include "Builder/BuildGraph.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Builder/DepGraph.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <vector>
 

src/Builder/Project.cc

@@ -3,10 +3,10 @@
 #include "Algos.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Git2.hpp"
-#include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
 #include <filesystem>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <unordered_map>
@@ -199,7 +199,7 @@ Result<Project> Project::init(const BuildProfile& buildProfile,
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 

src/Builder/Project.hpp

@@ -3,9 +3,9 @@
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
+#include <rs/result.hpp>
 
 namespace cabin {
 

src/Cli.cc

@@ -2,7 +2,6 @@
 
 #include "Algos.hpp"
 #include "Diag.hpp"
-#include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
 #include <algorithm>
@@ -11,6 +10,7 @@
 #include <cstdlib>
 #include <fmt/core.h>
 #include <functional>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>
@@ -709,7 +709,7 @@ Cli::printHelp(const CliArgsView args) const noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace cabin {