From 09502456f83173b763864ecc68c935e4d8ee82f7 Mon Sep 17 00:00:00 2001
From: Nicholas Ormrod <njormrod@meta.com>
Date: Mon, 6 May 2024 07:32:05 -0700
Subject: [PATCH] Deshim jemalloc in folly

Summary:
The following rules were deshimmed:
```
//folly/experimental:jemalloc_nodump_allocator -> //folly/memory:jemalloc_nodump_allocator
//folly/experimental:jemalloc_huge_page_allocator -> //folly/memory:jemalloc_huge_page_allocator
```

The following headers were deshimmed:
```
folly/experimental/JemallocNodumpAllocator.h -> folly/memory/JemallocNodumpAllocator.h
folly/experimental/JemallocHugePageAllocator.h -> folly/memory/JemallocHugePageAllocator.h
```

This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle.
You have been added as a reviewer by Sentinel or Butterfly.

Reviewed By: yfeldblum

Differential Revision: D56308346

fbshipit-source-id: 0c03dc304d8c6ae76675d4dce95b5f75f1b34e4e
---
 folly/compression/BUCK                                 | 2 +-
 folly/compression/CompressionContextPoolSingletons.cpp | 2 +-
 folly/memory/BUCK                                      | 4 ++--
 folly/memory/JemallocHugePageAllocatorTest.cpp         | 2 +-
 folly/memory/JemallocNodumpAllocatorTest.cpp           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/folly/compression/BUCK b/folly/compression/BUCK
index ff4b2dd3243..c1b7de59a6e 100644
--- a/folly/compression/BUCK
+++ b/folly/compression/BUCK
@@ -70,7 +70,7 @@ cpp_library(
     headers = ["CompressionContextPoolSingletons.h"],
     deps = [
         "//folly:portability",
-        "//folly/experimental:jemalloc_huge_page_allocator",
+        "//folly/memory:jemalloc_huge_page_allocator",
         "//folly/memory:malloc",
     ],
     exported_deps = [
diff --git a/folly/compression/CompressionContextPoolSingletons.cpp b/folly/compression/CompressionContextPoolSingletons.cpp
index d33ab8590bc..ba69df8c6f8 100644
--- a/folly/compression/CompressionContextPoolSingletons.cpp
+++ b/folly/compression/CompressionContextPoolSingletons.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #if FOLLY_COMPRESSION_USE_HUGEPAGES
-#include <folly/experimental/JemallocHugePageAllocator.h>
+#include <folly/memory/JemallocHugePageAllocator.h>
 #endif
 
 #if FOLLY_HAVE_LIBZSTD
diff --git a/folly/memory/BUCK b/folly/memory/BUCK
index e33e45040fd..ccce7ba93fc 100644
--- a/folly/memory/BUCK
+++ b/folly/memory/BUCK
@@ -171,7 +171,7 @@ cpp_unittest(
     allocator = "jemalloc",
     deps = [
         "//folly/container:f14_hash",
-        "//folly/experimental:jemalloc_huge_page_allocator",
+        "//folly/memory:jemalloc_huge_page_allocator",
         "//folly/memory:malloc",
         "//folly/portability:gtest",
     ],
@@ -183,8 +183,8 @@ cpp_unittest(
     headers = [],
     allocator = "jemalloc",
     deps = [
-        "//folly/experimental:jemalloc_nodump_allocator",
         "//folly/io:iobuf",
+        "//folly/memory:jemalloc_nodump_allocator",
         "//folly/memory:malloc",
         "//folly/portability:gtest",
     ],
diff --git a/folly/memory/JemallocHugePageAllocatorTest.cpp b/folly/memory/JemallocHugePageAllocatorTest.cpp
index 1eb9ecbc0bf..222bde753d9 100644
--- a/folly/memory/JemallocHugePageAllocatorTest.cpp
+++ b/folly/memory/JemallocHugePageAllocatorTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/JemallocHugePageAllocator.h>
+#include <folly/memory/JemallocHugePageAllocator.h>
 
 #include <folly/container/F14Map.h>
 
diff --git a/folly/memory/JemallocNodumpAllocatorTest.cpp b/folly/memory/JemallocNodumpAllocatorTest.cpp
index 62b22c5b979..3a1a9aeee78 100644
--- a/folly/memory/JemallocNodumpAllocatorTest.cpp
+++ b/folly/memory/JemallocNodumpAllocatorTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/JemallocNodumpAllocator.h>
+#include <folly/memory/JemallocNodumpAllocator.h>
 
 #include <folly/io/IOBuf.h>
 #include <folly/memory/Malloc.h>