Refactor Lister

Signed-off-by: Jack Drogon <[email protected]>
apache · Nov 18, 2023 · cf59ad8 · cf59ad8
1 parent b94d3b6
commit cf59ad8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bindings/cpp/include/lister.hpp b/bindings/cpp/include/lister.hpp
@@ -40,8 +40,7 @@ namespace opendal {
  */
 class Lister {
  public:
-  Lister(rust::Box<opendal::ffi::Lister> &&lister)
-      : raw_lister_(std::move(lister)) {}
+  Lister(rust::Box<opendal::ffi::Lister> &&lister) noexcept;
 
   /**
    * @class ListerIterator

diff --git a/bindings/cpp/include/operator.hpp b/bindings/cpp/include/operator.hpp
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "entry.hpp"
-#include "lib.rs.h"
 #include "lister.hpp"
 #include "metadata.hpp"
 #include "reader.hpp"

diff --git a/bindings/cpp/include/reader.hpp b/bindings/cpp/include/reader.hpp
@@ -49,6 +49,7 @@ class Reader
   std::streampos seek(std::streamoff off, std::ios_base::seekdir way);
 
  private:
+  struct Rep;
   rust::Box<opendal::ffi::Reader> raw_reader_;
 };
 

diff --git a/bindings/cpp/src/lister.cpp b/bindings/cpp/src/lister.cpp
@@ -23,13 +23,14 @@
 
 namespace opendal {
 
+Lister::Lister(rust::Box<opendal::ffi::Lister> &&lister) noexcept
+    : raw_lister_(std::move(lister)) {}
+
 std::optional<Entry> Lister::next() {
-  auto entry = raw_lister_->next();
-  if (entry.has_value) {
+  if (auto entry = raw_lister_->next(); entry.has_value) {
     return std::move(entry.value);
-  } else {
-    return std::nullopt;
   }
+  return std::nullopt;
 }
 
 }  // namespace opendal