merge: with main

Author: bekard

Dockerfile

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

Makefile

@@ -23,9 +23,9 @@ 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 := v11.0.0
 
-GIT_DEPS   := $(O)/DEPS/toml11 $(O)/DEPS/mitama-cpp-result
+GIT_DEPS   := $(O)/DEPS/toml11 $(O)/DEPS/mitama-cpp-result $(O)/DEPS/rs-cpp
 
 # System dependency versions
 PKGS :=							\
@@ -44,8 +44,9 @@ 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 \
-  -isystem $(O)/DEPS/mitama-cpp-result/include
+INCLUDES := -Iinclude -Isrc -isystem $(O)/DEPS/toml11/include \
+  -isystem $(O)/DEPS/mitama-cpp-result/include \
+  -isystem $(O)/DEPS/rs-cpp/include
 
 CXXFLAGS := -std=c++$(EDITION) -fdiagnostics-color $(CUSTOM_CXXFLAGS) \
   $(DEFINES) $(INCLUDES) $(PKG_CFLAGS) -MMD -MP
@@ -105,3 +106,7 @@ $(O)/DEPS/mitama-cpp-result:
 	@mkdir -p $(@D)
 	@$(GIT) clone https://github.com/loliGothicK/mitama-cpp-result.git $@
 	@$(GIT) -C $@ reset --hard $(RESULT_VER)
+
+$(O)/DEPS/rs-cpp:
+	@mkdir -p $(@D)
+	@$(GIT) clone https://github.com/ken-matsui/rs-cpp.git $@

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 = {git = "https://github.com/ken-matsui/rs-cpp.git", branch = "main"}
 
 [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>
@@ -17,9 +17,9 @@ std::string toMacroName(std::string_view name) noexcept;
 std::string replaceAll(std::string str, std::string_view from,
                        std::string_view to) noexcept;
 
-Result<ExitStatus> execCmd(const Command& cmd) noexcept;
-Result<std::string> getCmdOutput(const Command& cmd,
-                                 std::size_t retry = 3) noexcept;
+rs::Result<ExitStatus> execCmd(const Command& cmd) noexcept;
+rs::Result<std::string> getCmdOutput(const Command& cmd,
+                                     std::size_t retry = 3) noexcept;
 bool commandExists(std::string_view cmd) noexcept;
 
 constexpr char toLower(char c) noexcept {

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>
@@ -34,8 +34,8 @@ class BuildGraph {
     TestKind kind = TestKind::Unit;
   };
 
-  static Result<BuildGraph> create(const Manifest& manifest,
-                                   const BuildProfile& buildProfile);
+  static rs::Result<BuildGraph> create(const Manifest& manifest,
+                                       const BuildProfile& buildProfile);
 
   const fs::path& outBasePath() const { return outBasePath_; }
   const Manifest& manifest() const { return project.manifest; }
@@ -46,16 +46,16 @@ class BuildGraph {
   const std::string& libraryName() const { return libName; }
   const std::vector<TestTarget>& testTargets() const { return testTargets_; }
 
-  Result<void> installDeps(bool includeDevDeps);
+  rs::Result<void> installDeps(bool includeDevDeps);
   void enableCoverage();
-  Result<void> plan(bool logAnalysis = true);
-  Result<void> writeBuildFilesIfNeeded() const;
-  Result<void> generateCompdb() const;
+  rs::Result<void> plan(bool logAnalysis = true);
+  rs::Result<void> writeBuildFilesIfNeeded() const;
+  rs::Result<void> generateCompdb() const;
 
-  Result<bool> needsBuild(const std::vector<std::string>& targets) const;
+  rs::Result<bool> needsBuild(const std::vector<std::string>& targets) const;
   Command ninjaCommand(bool dryRun = false) const;
-  Result<ExitStatus> buildTargets(const std::vector<std::string>& targets,
-                                  std::string_view displayName) const;
+  rs::Result<ExitStatus> buildTargets(const std::vector<std::string>& targets,
+                                      std::string_view displayName) const;
 
 private:
   struct CompileUnit {
@@ -84,22 +84,22 @@ class BuildGraph {
                            const std::unordered_set<std::string>& dependencies,
                            bool isTest);
 
-  Result<std::string> runMM(const std::string& sourceFile,
-                            bool isTest = false) const;
-  Result<bool> containsTestCode(const std::string& sourceFile) const;
+  rs::Result<std::string> runMM(const std::string& sourceFile,
+                                bool isTest = false) const;
+  rs::Result<bool> containsTestCode(const std::string& sourceFile) const;
 
-  Result<void> processSrc(const fs::path& sourceFilePath,
-                          const SourceRoot& root,
-                          std::unordered_set<std::string>& buildObjTargets,
-                          tbb::spin_mutex* mtx = nullptr);
-  Result<std::unordered_set<std::string>>
+  rs::Result<void> processSrc(const fs::path& sourceFilePath,
+                              const SourceRoot& root,
+                              std::unordered_set<std::string>& buildObjTargets,
+                              tbb::spin_mutex* mtx = nullptr);
+  rs::Result<std::unordered_set<std::string>>
   processSources(const std::vector<fs::path>& sourceFilePaths,
                  const SourceRoot& root);
 
-  Result<std::optional<TestTarget>>
+  rs::Result<std::optional<TestTarget>>
   processUnittestSrc(const fs::path& sourceFilePath,
                      tbb::spin_mutex* mtx = nullptr);
-  Result<std::optional<TestTarget>>
+  rs::Result<std::optional<TestTarget>>
   processIntegrationTestSrc(const fs::path& sourceFilePath,
                             tbb::spin_mutex* mtx = nullptr);
 
@@ -108,7 +108,7 @@ class BuildGraph {
       const std::unordered_set<std::string>& objTargetDeps,
       const std::unordered_set<std::string>& buildObjTargets) const;
 
-  Result<void> configure();
+  rs::Result<void> configure();
   void writeBuildFiles() const;
 
   fs::path outBasePath_;

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>
@@ -44,7 +44,8 @@ struct CFlags {
       : macros(std::move(macros)), includeDirs(std::move(includeDirs)),
         others(std::move(others)) {}
 
-  static Result<CFlags> parsePkgConfig(std::string_view pkgConfigVer) noexcept;
+  static rs::Result<CFlags>
+  parsePkgConfig(std::string_view pkgConfigVer) noexcept;
 
   void merge(const CFlags& other) noexcept;
 };
@@ -71,7 +72,8 @@ struct LdFlags {
   LdFlags(std::vector<LibDir> libDirs, std::vector<Lib> libs,
           std::vector<std::string> others) noexcept;
 
-  static Result<LdFlags> parsePkgConfig(std::string_view pkgConfigVer) noexcept;
+  static rs::Result<LdFlags>
+  parsePkgConfig(std::string_view pkgConfigVer) noexcept;
 
   void merge(const LdFlags& other) noexcept;
 };
@@ -84,8 +86,9 @@ struct CompilerOpts {
   CompilerOpts(CFlags cFlags, LdFlags ldFlags) noexcept
       : cFlags(std::move(cFlags)), ldFlags(std::move(ldFlags)) {}
 
-  static Result<CompilerOpts> parsePkgConfig(const VersionReq& pkgVerReq,
-                                             std::string_view pkgName) noexcept;
+  static rs::Result<CompilerOpts>
+  parsePkgConfig(const VersionReq& pkgVerReq,
+                 std::string_view pkgName) noexcept;
 
   void merge(const CompilerOpts& other) noexcept;
 };
@@ -95,7 +98,7 @@ class Compiler {
   const std::string cxx;
 
   static Compiler init(std::string cxx) noexcept;
-  static Result<Compiler> init() noexcept;
+  static rs::Result<Compiler> init() noexcept;
 
   Command makeCompileCmd(const CompilerOpts& opts,
                          const std::string& sourceFile,

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 {
@@ -17,8 +17,9 @@ class DepGraph {
 public:
   explicit DepGraph(fs::path rootPath) : rootPath(std::move(rootPath)) {}
 
-  Result<void> resolve();
-  Result<BuildGraph> computeBuildGraph(const BuildProfile& buildProfile) const;
+  rs::Result<void> resolve();
+  rs::Result<BuildGraph>
+  computeBuildGraph(const BuildProfile& buildProfile) const;
 
 private:
   fs::path rootPath;

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>
@@ -53,8 +52,8 @@ class Child {
   friend struct Command;
 
 public:
-  Result<ExitStatus> wait() const noexcept;
-  Result<CommandOutput> waitWithOutput() const noexcept;
+  rs::Result<ExitStatus> wait() const noexcept;
+  rs::Result<CommandOutput> waitWithOutput() const noexcept;
 };
 
 struct Command {
@@ -111,8 +110,8 @@ struct Command {
 
   std::string toString() const;
 
-  Result<Child> spawn() const noexcept;
-  Result<CommandOutput> output() const noexcept;
+  rs::Result<Child> spawn() const noexcept;
+  rs::Result<CommandOutput> output() const noexcept;
 };
 
 } // namespace cabin

include/Dependency.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
 #include "Builder/Compiler.hpp"
-#include "Rustify/Result.hpp"
 #include "VersionReq.hpp"
 
+#include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <utility>
 #include <variant>
@@ -16,7 +17,8 @@ struct GitDependency {
   const std::string url;
   const std::optional<std::string> target;
 
-  Result<CompilerOpts> install() const;
+  [[nodiscard]] std::filesystem::path installDir() const;
+  rs::Result<CompilerOpts> install() const;
 
   GitDependency(std::string name, std::string url,
                 std::optional<std::string> target)
@@ -27,7 +29,7 @@ struct PathDependency {
   const std::string name;
   const std::string path;
 
-  Result<CompilerOpts> install() const;
+  rs::Result<CompilerOpts> install() const;
 
   PathDependency(std::string name, std::string path)
       : name(std::move(name)), path(std::move(path)) {}
@@ -37,7 +39,7 @@ struct SystemDependency {
   const std::string name;
   const VersionReq versionReq;
 
-  Result<CompilerOpts> install() const;
+  rs::Result<CompilerOpts> install() const;
 
   SystemDependency(std::string name, VersionReq versionReq)
       : name(std::move(name)), versionReq(std::move(versionReq)) {}