feat update optional

src/sled/cleanup.h

@@ -50,7 +50,7 @@ public:
     }
 
 private:
-    sled::optional<Callback> callback_;
+    tl::optional<Callback> callback_;
 };
 
 template<typename... Args, typename Callback>

src/sled/config.cc

@@ -256,16 +256,16 @@ Config::AddDefaultNode(sled::string_view key, ValueType value)
         auto first_key = keys[0];
         switch (value.index()) {
         case 0:
-            toml_[first_key] = sled::get<bool>(value);
+            toml_[first_key] = mpark::get<bool>(value);
             break;
         case 1:
-            toml_[first_key] = sled::get<std::string>(value);
+            toml_[first_key] = mpark::get<std::string>(value);
             break;
         case 2:
-            toml_[first_key] = sled::get<int>(value);
+            toml_[first_key] = mpark::get<int>(value);
             break;
         case 3:
-            toml_[first_key] = sled::get<double>(value);
+            toml_[first_key] = mpark::get<double>(value);
             break;
         default:
             return false;
@@ -284,16 +284,16 @@ Config::GetValueNode(sled::string_view key, toml::value &value) const
     auto &default_value = iter->second;
     switch (default_value.index()) {
     case 0:
-        value = sled::get<bool>(default_value);
+        value = mpark::get<bool>(default_value);
         break;
     case 1:
-        value = sled::get<std::string>(default_value);
+        value = mpark::get<std::string>(default_value);
         break;
     case 2:
-        value = sled::get<int>(default_value);
+        value = mpark::get<int>(default_value);
         break;
     case 3:
-        value = sled::get<double>(default_value);
+        value = mpark::get<double>(default_value);
         break;
     default:
         return false;
@@ -309,16 +309,16 @@ Config::GetDefaultNode(sled::string_view key, toml::value &value) const
     auto &default_value = iter->second;
     switch (default_value.index()) {
     case 0:
-        value = sled::get<bool>(default_value);
+        value = mpark::get<bool>(default_value);
         break;
     case 1:
-        value = sled::get<std::string>(default_value);
+        value = mpark::get<std::string>(default_value);
         break;
     case 2:
-        value = sled::get<int>(default_value);
+        value = mpark::get<int>(default_value);
         break;
     case 3:
-        value = sled::get<double>(default_value);
+        value = mpark::get<double>(default_value);
         break;
     default:
         return false;

src/sled/config.h

@@ -8,9 +8,9 @@
 namespace sled {
 class Config {
 public:
-    using ValueType = sled::variant<bool, std::string, int, double>;
+    using ValueType = mpark::variant<bool, std::string, int, double>;
     Config();
-    virtual ~Config()=default;
+    virtual ~Config() = default;
     Config(sled::string_view name);
     Config(sled::string_view name, sled::string_view path);
     Config(const Config &lhs)                = delete;

src/sled/operations_chain.h

@@ -38,7 +38,7 @@ public:
 
     void Run() override
     {
-        has_run_ = true;
+        has_run_     = true;
         auto functor = std::move(functor_);
         functor(std::move(callback_));
     }
@@ -54,7 +54,7 @@ class OperationsChain final : public RefCountedNonVirtual<OperationsChain> {
 public:
     static scoped_refptr<OperationsChain> Create();
     ~OperationsChain();
-    OperationsChain(const OperationsChain &) = delete;
+    OperationsChain(const OperationsChain &)           = delete;
     OperationsChain operator=(const OperationsChain &) = delete;
 
     void SetOnChainEmptyCallback(std::function<void()> on_chain_empty_callback);
@@ -79,7 +79,7 @@ private:
         explicit CallbackHandle(scoped_refptr<OperationsChain> operations_chain);
         ~CallbackHandle();
 
-        CallbackHandle(const CallbackHandle &) = delete;
+        CallbackHandle(const CallbackHandle &)            = delete;
         CallbackHandle &operator=(const CallbackHandle &) = delete;
         void OnOperationComplete();
 
@@ -93,7 +93,7 @@ private:
     void OnOperationComplete();
 
     std::queue<std::unique_ptr<internal::Operation>> chained_operations_;
-    sled::optional<std::function<void()>> on_chain_empty_callback_;
+    tl::optional<std::function<void()>> on_chain_empty_callback_;
 };
 
 }// namespace sled

src/sled/optional.h

@@ -2178,6 +2178,12 @@ struct hash<tl::optional<T>> {
 };
 }// namespace std
 
+#endif
+
+#ifndef SLED_OPTIONAL_H
+#define SLED_OPTIONAL_H
+
+// TODO: Remove this
 namespace sled {
 using namespace tl;
 }

src/sled/status_or.h

@@ -143,7 +143,7 @@ private:
     }
 
     Status status_;
-    sled::optional<T> value_;
+    tl::optional<T> value_;
 };
 
 template<typename T>

src/sled/system/hot_reloader.cc

@@ -66,9 +66,9 @@ public:
         return false;
     }
 
-    sled::optional<Failure> Update(bool force_reload)
+    tl::optional<Failure> Update(bool force_reload)
     {
-        if (cr_plugin_update(ctx_, force_reload) == 0) { return sled::nullopt; }
+        if (cr_plugin_update(ctx_, force_reload) == 0) { return tl::nullopt; }
         return detail::TranslateFailure(ctx_.failure);
     }
 
@@ -97,7 +97,7 @@ HotReloader::Initialize()
     return impl_->Initialize();
 }
 
-sled::optional<HotReloader::Failure>
+tl::optional<HotReloader::Failure>
 HotReloader::UpdateOrError(bool force_reload)
 {
     return impl_->Update(force_reload);

src/sled/system/hot_reloader.h

@@ -76,7 +76,7 @@ public:
      * @force_reload: 如果当前库已经加载，是否reload当前库
      * @ status: 如果不为nullptr，返回当前加载状态
     **/
-    sled::optional<Failure> UpdateOrError(bool force_reload = true);
+    tl::optional<Failure> UpdateOrError(bool force_reload = true);
     // bool Rollback();
 
     void set_userdata(void *data);