backingstore: rename RustBackingStore and HgNativeBackingStore

Summary:
On the hg side, let's consistently use the namespace sapling, and
instead of using the word "Rust" in the API, let's call them bindings.

Reviewed By: xavierd

Differential Revision: D40959727

fbshipit-source-id: 687c8c78fd69e2478dfbf5b0573c3bccec340ce3

eden/fs/store/hg/HgDatapackStore.h

@@ -12,7 +12,7 @@
 
 #include "eden/fs/telemetry/RequestMetricsScope.h"
 #include "eden/fs/utils/PathFuncs.h"
-#include "eden/scm/lib/backingstore/c_api/HgNativeBackingStore.h"
+#include "eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.h"
 
 namespace facebook::eden {
 
@@ -97,7 +97,7 @@ class HgDatapackStore {
   }
 
  private:
-  HgNativeBackingStore store_;
+  sapling::SaplingNativeBackingStore store_;
   std::shared_ptr<ReloadableConfig> config_;
 
   mutable RequestMetricsScope::LockedRequestWatchList liveBatchedBlobWatches_;

eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.cpp

@@ -5,7 +5,7 @@
  * GNU General Public License version 2.
  */
 
-#include "eden/scm/lib/backingstore/c_api/HgNativeBackingStore.h"
+#include "eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.h"
 
 #include <folly/Range.h>
 #include <folly/String.h>
@@ -15,9 +15,7 @@
 #include <memory>
 #include <stdexcept>
 
-namespace facebook::eden {
-
-using namespace sapling;
+namespace sapling {
 
 namespace {
 /**
@@ -116,7 +114,7 @@ void getTreeBatchCallback(
 }
 } // namespace
 
-HgNativeBackingStore::HgNativeBackingStore(
+SaplingNativeBackingStore::SaplingNativeBackingStore(
     std::string_view repository,
     const BackingStoreOptions& options) {
   CFallible<BackingStore, sapling_backingstore_free> store{
@@ -129,7 +127,7 @@ HgNativeBackingStore::HgNativeBackingStore(
   store_ = store.unwrap();
 }
 
-std::unique_ptr<folly::IOBuf> HgNativeBackingStore::getBlob(
+std::unique_ptr<folly::IOBuf> SaplingNativeBackingStore::getBlob(
     folly::ByteRange name,
     folly::ByteRange node,
     bool local) {
@@ -148,7 +146,7 @@ std::unique_ptr<folly::IOBuf> HgNativeBackingStore::getBlob(
   return bytesToIOBuf(result.unwrap().release());
 }
 
-std::shared_ptr<FileAuxData> HgNativeBackingStore::getBlobMetadata(
+std::shared_ptr<FileAuxData> SaplingNativeBackingStore::getBlobMetadata(
     folly::ByteRange node,
     bool local) {
   XLOG(DBG7) << "Importing blob metadata"
@@ -166,7 +164,7 @@ std::shared_ptr<FileAuxData> HgNativeBackingStore::getBlobMetadata(
   return result.unwrap();
 }
 
-void HgNativeBackingStore::getBlobMetadataBatch(
+void SaplingNativeBackingStore::getBlobMetadataBatch(
     const std::vector<std::pair<folly::ByteRange, folly::ByteRange>>& requests,
     bool local,
     std::function<void(size_t, std::shared_ptr<FileAuxData>)>&& resolve) {
@@ -231,7 +229,7 @@ void HgNativeBackingStore::getBlobMetadataBatch(
       });
 }
 
-void HgNativeBackingStore::getBlobBatch(
+void SaplingNativeBackingStore::getBlobBatch(
     const std::vector<std::pair<folly::ByteRange, folly::ByteRange>>& requests,
     bool local,
     std::function<void(size_t, std::unique_ptr<folly::IOBuf>)>&& resolve) {
@@ -295,7 +293,7 @@ void HgNativeBackingStore::getBlobBatch(
       });
 }
 
-void HgNativeBackingStore::getTreeBatch(
+void SaplingNativeBackingStore::getTreeBatch(
     const std::vector<std::pair<folly::ByteRange, folly::ByteRange>>& requests,
     bool local,
     std::function<void(size_t, std::shared_ptr<Tree>)>&& resolve) {
@@ -355,7 +353,7 @@ void HgNativeBackingStore::getTreeBatch(
       });
 }
 
-std::shared_ptr<Tree> HgNativeBackingStore::getTree(
+std::shared_ptr<Tree> SaplingNativeBackingStore::getTree(
     folly::ByteRange node,
     bool local) {
   XLOG(DBG7) << "Importing tree node=" << folly::hexlify(node)
@@ -373,10 +371,10 @@ std::shared_ptr<Tree> HgNativeBackingStore::getTree(
   return manifest.unwrap();
 }
 
-void HgNativeBackingStore::flush() {
+void SaplingNativeBackingStore::flush() {
   XLOG(DBG7) << "Flushing backing store";
 
   sapling_backingstore_flush(store_.get());
 }
 
-} // namespace facebook::eden
+} // namespace sapling

eden/scm/lib/backingstore/c_api/SaplingNativeBackingStore.h

@@ -11,19 +11,17 @@
 #include <memory>
 #include <string_view>
 
-#include "eden/scm/lib/backingstore/c_api/RustBackingStore.h"
+#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
 
 namespace folly {
 class IOBuf;
 } // namespace folly
 
-namespace facebook::eden {
+namespace sapling {
 
-using BackingStoreOptions = sapling::BackingStoreOptions;
-
-class HgNativeBackingStore {
+class SaplingNativeBackingStore {
  public:
-  HgNativeBackingStore(
+  SaplingNativeBackingStore(
       std::string_view repository,
       const BackingStoreOptions& options);
 
@@ -74,4 +72,4 @@ class HgNativeBackingStore {
       sapling::sapling_backingstore_free>::Ptr store_;
 };
 
-} // namespace facebook::eden
+} // namespace sapling

eden/scm/lib/backingstore/test/CBytesTest.cpp

@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>
 #include <cstring>
 
-#include "eden/scm/lib/backingstore/c_api/RustBackingStore.h"
+#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
 
 namespace {
 

eden/scm/lib/backingstore/test/CFallibleTest.cpp

@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 #include <cstdio>
 
-#include "eden/scm/lib/backingstore/c_api/RustBackingStore.h"
+#include "eden/scm/lib/backingstore/c_api/BackingStoreBindings.h"
 
 namespace {
 

eden/scm/lib/backingstore/tools/cbindgen.sh

@@ -15,7 +15,7 @@ cd "$(dirname "$0")"/..
 set -e
 
 CONFIG="cbindgen.toml"
-OUTPUT="c_api/RustBackingStore.h"
+OUTPUT="c_api/BackingStoreBindings.h"
 
 main() {
   cbindgen --config "$CONFIG" --output "$OUTPUT"