From 1badabb2b6715e70e47040711607e620c5952adf Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Sun, 29 Oct 2017 13:55:29 -0700
Subject: [PATCH] CodeMod: Replace includes of folly/Hash.h with
 folly/hash/Hash.h

Summary: CodeMod: Replace includes of `folly/Hash.h` with `folly/hash/Hash.h`.

Reviewed By: luciang

Differential Revision: D6156195

fbshipit-source-id: 0941b3c9cf1d17d7cc62595111e506c06ee51236
---
 folly/AtomicHashArray.h                      | 2 +-
 folly/AtomicHashMap.h                        | 2 +-
 folly/FBString.h                             | 2 +-
 folly/FixedString.h                          | 2 +-
 folly/IPAddressV4.h                          | 2 +-
 folly/IPAddressV6.h                          | 2 +-
 folly/Singleton.h                            | 2 +-
 folly/SocketAddress.cpp                      | 2 +-
 folly/Uri-inl.h                              | 2 +-
 folly/concurrency/CacheLocality.h            | 2 +-
 folly/detail/Futex.cpp                       | 2 +-
 folly/detail/MemoryIdler.h                   | 2 +-
 folly/dynamic.cpp                            | 2 +-
 folly/experimental/FunctionScheduler.h       | 4 ++--
 folly/experimental/StringKeyedUnorderedMap.h | 2 +-
 folly/experimental/StringKeyedUnorderedSet.h | 2 +-
 folly/experimental/symbolizer/ElfCache.h     | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/folly/AtomicHashArray.h b/folly/AtomicHashArray.h
index 16b8dad0..654077b1 100644
--- a/folly/AtomicHashArray.h
+++ b/folly/AtomicHashArray.h
@@ -37,9 +37,9 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <folly/Hash.h>
 #include <folly/ThreadCachedInt.h>
 #include <folly/Utility.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 280b0dd9..2243b6be 100644
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -91,10 +91,10 @@
 #include <stdexcept>
 
 #include <folly/AtomicHashArray.h>
-#include <folly/Hash.h>
 #include <folly/Likely.h>
 #include <folly/ThreadCachedInt.h>
 #include <folly/container/Foreach.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/FBString.h b/folly/FBString.h
index 9c9f670b..4882aac5 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -54,8 +54,8 @@
 #include <string>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Traits.h>
+#include <folly/hash/Hash.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/BitsFunctexcept.h>
 
diff --git a/folly/FixedString.h b/folly/FixedString.h
index cec00226..ece7691b 100644
--- a/folly/FixedString.h
+++ b/folly/FixedString.h
@@ -409,7 +409,7 @@ struct ReverseIterator {
 } // namespace fixedstring
 } // namespace detail
 
-// Defined in folly/Hash.h
+// Defined in folly/hash/Hash.h
 std::uint32_t hsieh_hash32_buf(const void* buf, std::size_t len);
 
 /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** *
diff --git a/folly/IPAddressV4.h b/folly/IPAddressV4.h
index 96de8add..76534add 100644
--- a/folly/IPAddressV4.h
+++ b/folly/IPAddressV4.h
@@ -23,9 +23,9 @@
 #include <iosfwd>
 
 #include <folly/FBString.h>
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/IPAddressV6.h b/folly/IPAddressV6.h
index f641bdcd..78ec4c76 100644
--- a/folly/IPAddressV6.h
+++ b/folly/IPAddressV6.h
@@ -25,10 +25,10 @@
 #include <stdexcept>
 
 #include <folly/FBString.h>
-#include <folly/Hash.h>
 #include <folly/Optional.h>
 #include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/Singleton.h b/folly/Singleton.h
index 40e9dad6..01a9d5d1 100644
--- a/folly/Singleton.h
+++ b/folly/Singleton.h
@@ -125,12 +125,12 @@
 #include <folly/Demangle.h>
 #include <folly/Exception.h>
 #include <folly/Executor.h>
-#include <folly/Hash.h>
 #include <folly/Memory.h>
 #include <folly/RWSpinLock.h>
 #include <folly/Synchronized.h>
 #include <folly/detail/StaticSingletonManager.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>
+#include <folly/hash/Hash.h>
 
 #include <algorithm>
 #include <atomic>
diff --git a/folly/SocketAddress.cpp b/folly/SocketAddress.cpp
index 6cb5a7a0..af6cd77f 100644
--- a/folly/SocketAddress.cpp
+++ b/folly/SocketAddress.cpp
@@ -32,7 +32,7 @@
 #include <folly/CppAttributes.h>
 #include <folly/Exception.h>
 #include <folly/Format.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 namespace {
 
diff --git a/folly/Uri-inl.h b/folly/Uri-inl.h
index 6445eef3..50d57c2e 100644
--- a/folly/Uri-inl.h
+++ b/folly/Uri-inl.h
@@ -22,7 +22,7 @@
 #include <tuple>
 
 #include <folly/Conv.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/concurrency/CacheLocality.h b/folly/concurrency/CacheLocality.h
index 457e107a..caae2395 100644
--- a/folly/concurrency/CacheLocality.h
+++ b/folly/concurrency/CacheLocality.h
@@ -28,11 +28,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include <folly/Hash.h>
 #include <folly/Indestructible.h>
 #include <folly/Likely.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/BitsFunctexcept.h>
 #include <folly/portability/Memory.h>
 #include <folly/system/ThreadId.h>
diff --git a/folly/detail/Futex.cpp b/folly/detail/Futex.cpp
index 8604a745..da7a04dc 100644
--- a/folly/detail/Futex.cpp
+++ b/folly/detail/Futex.cpp
@@ -16,8 +16,8 @@
 
 #include <folly/detail/Futex.h>
 #include <boost/intrusive/list.hpp>
-#include <folly/Hash.h>
 #include <folly/ScopeGuard.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/SysSyscall.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/folly/detail/MemoryIdler.h b/folly/detail/MemoryIdler.h
index 1a8fe3ae..1cabfecc 100644
--- a/folly/detail/MemoryIdler.h
+++ b/folly/detail/MemoryIdler.h
@@ -20,9 +20,9 @@
 #include <chrono>
 
 #include <folly/AtomicStruct.h>
-#include <folly/Hash.h>
 #include <folly/Traits.h>
 #include <folly/detail/Futex.h>
+#include <folly/hash/Hash.h>
 #include <folly/system/ThreadId.h>
 
 namespace folly {
diff --git a/folly/dynamic.cpp b/folly/dynamic.cpp
index f2be8f27..8c25017d 100644
--- a/folly/dynamic.cpp
+++ b/folly/dynamic.cpp
@@ -17,7 +17,7 @@
 #include <folly/dynamic.h>
 
 #include <folly/Format.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <folly/lang/Assume.h>
 #include <folly/portability/BitsFunctexcept.h>
 
diff --git a/folly/experimental/FunctionScheduler.h b/folly/experimental/FunctionScheduler.h
index 59dc4bce..35d3e308 100644
--- a/folly/experimental/FunctionScheduler.h
+++ b/folly/experimental/FunctionScheduler.h
@@ -18,13 +18,13 @@
 
 #include <folly/Function.h>
 #include <folly/Range.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace folly {
 
diff --git a/folly/experimental/StringKeyedUnorderedMap.h b/folly/experimental/StringKeyedUnorderedMap.h
index 41180cb7..4cf33b43 100644
--- a/folly/experimental/StringKeyedUnorderedMap.h
+++ b/folly/experimental/StringKeyedUnorderedMap.h
@@ -24,9 +24,9 @@
 #include <unordered_map>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/experimental/StringKeyedUnorderedSet.h b/folly/experimental/StringKeyedUnorderedSet.h
index 11317ede..269d2e6d 100644
--- a/folly/experimental/StringKeyedUnorderedSet.h
+++ b/folly/experimental/StringKeyedUnorderedSet.h
@@ -24,9 +24,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 
diff --git a/folly/experimental/symbolizer/ElfCache.h b/folly/experimental/symbolizer/ElfCache.h
index b9d7d966..57a36cf7 100644
--- a/folly/experimental/symbolizer/ElfCache.h
+++ b/folly/experimental/symbolizer/ElfCache.h
@@ -29,9 +29,9 @@
 #include <boost/operators.hpp>
 #include <glog/logging.h>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/symbolizer/Elf.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 namespace symbolizer {
-- 
2.34.1