Apply clang-format to folly/io/ (namespace)

Summary: [Folly] Apply `clang-format` to `folly/io/` (namespace).

Reviewed By: Orvid, terrelln

Differential Revision: D5366477

fbshipit-source-id: b4efcdc66c62885f5574b2940e5138590710deae

diff --git a/folly/io/Compression.cpp b/folly/io/Compression.cpp
index 3e027d19fea27127c5725e035c30154d7915d935..98f332b85eb55d34f047d47ef51e7cd368369e16 100644 (file)
--- a/folly/io/Compression.cpp
+++ b/folly/io/Compression.cpp
@@ -58,7 +58,8 @@
 #include <algorithm>
 #include <unordered_set>
 
-namespace folly { namespace io {
+namespace folly {
+namespace io {
 
 Codec::Codec(CodecType type) : type_(type) { }
 
@@ -512,7 +513,7 @@ inline uint64_t decodeVarintFromCursor(folly::io::Cursor& cursor) {
   return val;
 }
 
-}  // namespace
+} // namespace
 
 #endif  // FOLLY_HAVE_LIBLZ4 || FOLLY_HAVE_LIBLZMA
 
@@ -2323,4 +2324,5 @@ std::unique_ptr<Codec> getAutoUncompressionCodec(
     std::vector<std::unique_ptr<Codec>> customCodecs) {
   return AutomaticCodec::create(std::move(customCodecs));
 }
-}}  // namespaces
+} // namespace io
+} // namespace folly

diff --git a/folly/io/Compression.h b/folly/io/Compression.h
index 0a2423bf7d115c305d2ca463a687c5b6e19f0237..b8ff64553c0e0446ac660fb793b140b195a521b1 100644 (file)
--- a/folly/io/Compression.h
+++ b/folly/io/Compression.h
@@ -30,7 +30,8 @@
  * Compression / decompression over IOBufs
  */
 
-namespace folly { namespace io {
+namespace folly {
+namespace io {
 
 enum class CodecType {
   /**
@@ -466,4 +467,5 @@ bool hasCodec(CodecType type);
  * Check if a specified codec is supported and supports streaming.
  */
 bool hasStreamCodec(CodecType type);
-}} // namespaces
+} // namespace io
+} // namespace folly

diff --git a/folly/io/Cursor-inl.h b/folly/io/Cursor-inl.h
index 48a0ebd88d65eb3a0389f07f2f77840267e89170..e9dd4548258297bcbf38bb5149e6c677852d3929 100644 (file)
--- a/folly/io/Cursor-inl.h
+++ b/folly/io/Cursor-inl.h
@@ -105,6 +105,6 @@ void CursorBase<Derived, BufType>::skipWhile(const Predicate& predicate) {
   CursorNoopAppender appender;
   readWhile(predicate, appender);
 }
-}
-}
-} // folly::io::detail
+} // namespace detail
+} // namespace io
+} // namespace folly

diff --git a/folly/io/Cursor.cpp b/folly/io/Cursor.cpp
index 9d51092e5ee361dcde61bd8fcfc1ef940467471f..c51ce6cc029093764307a551fd5aa912b0c89576 100644 (file)
--- a/folly/io/Cursor.cpp
+++ b/folly/io/Cursor.cpp
@@ -18,7 +18,8 @@
 #include <cstdio>
 #include <folly/ScopeGuard.h>
 
-namespace folly { namespace io {
+namespace folly {
+namespace io {
 
 void Appender::printf(const char* fmt, ...) {
   va_list ap;
@@ -68,5 +69,5 @@ void Appender::vprintf(const char* fmt, va_list ap) {
   }
   append(len);
 }
-
-}}  // folly::io
+} // namespace io
+} // namespace folly

diff --git a/folly/io/Cursor.h b/folly/io/Cursor.h
index 23186764da40f631ae59b7f60b5bb9ca1a14cfd7..4d61b4f5d98996ff9065b80577649787c329ff72 100644 (file)
--- a/folly/io/Cursor.h
+++ b/folly/io/Cursor.h
@@ -48,7 +48,8 @@
  * Appender with a buffer chain; for this reason, Appenders assume private
  * access to the buffer (you need to call unshare() yourself if necessary).
  **/
-namespace folly { namespace io {
+namespace folly {
+namespace io {
 
 namespace detail {
 
@@ -618,7 +619,7 @@ class CursorBase {
   BufType* buffer_;
 };
 
-}  // namespace detail
+} // namespace detail
 
 class Cursor : public detail::CursorBase<Cursor, const IOBuf> {
  public:
@@ -1049,7 +1050,7 @@ class QueueAppender : public detail::Writable<QueueAppender> {
   folly::IOBufQueue* queue_;
   size_t growth_;
 };
-
-}}  // folly::io
+} // namespace io
+} // namespace folly
 
 #include <folly/io/Cursor-inl.h>

diff --git a/folly/io/RecordIO-inl.h b/folly/io/RecordIO-inl.h
index 441a88b87911516642ec785fcd2e59023beb13de..203fae9fa2722400b08d8deaaa0882e933098353 100644 (file)
--- a/folly/io/RecordIO-inl.h
+++ b/folly/io/RecordIO-inl.h
@@ -82,7 +82,7 @@ FOLLY_PACK_POP
 static_assert(offsetof(Header, headerHash) + sizeof(Header::headerHash) ==
               sizeof(Header), "invalid header layout");
 
-}  // namespace detail
+} // namespace detail
 
 constexpr size_t headerSize() { return sizeof(detail::Header); }
 
@@ -90,6 +90,6 @@ inline RecordInfo findRecord(ByteRange range, uint32_t fileId) {
   return findRecord(range, range, fileId);
 }
 
-}  // namespace recordio_helpers
+} // namespace recordio_helpers
 
-}  // namespaces
+} // namespace folly

diff --git a/folly/io/RecordIO.cpp b/folly/io/RecordIO.cpp
index 50c854ec01062bb23b0c0c1b6d216f14393f7724..f6fe3b6d16811897642997de946c6587369e5b2a 100644 (file)
--- a/folly/io/RecordIO.cpp
+++ b/folly/io/RecordIO.cpp
@@ -138,7 +138,7 @@ uint64_t dataHash(ByteRange range) {
   return hash::SpookyHashV2::Hash64(range.data(), range.size(), kHashSeed);
 }
 
-}  // namespace
+} // namespace
 
 size_t prependHeader(std::unique_ptr<IOBuf>& buf, uint32_t fileId) {
   if (fileId == 0) {
@@ -229,6 +229,6 @@ RecordInfo findRecord(ByteRange searchRange,
   return {0, {}};
 }
 
-}  // namespace
+} // namespace recordio_helpers
 
-}  // namespaces
+} // namespace folly

diff --git a/folly/io/RecordIO.h b/folly/io/RecordIO.h
index a350fc10404b45d78d35af19c8878a7ea7ed72b0..0acb4a20696226d3dc3719dcb91b6bf67ad18ef1 100644 (file)
--- a/folly/io/RecordIO.h
+++ b/folly/io/RecordIO.h
@@ -172,8 +172,8 @@ RecordInfo findRecord(ByteRange range, uint32_t fileId);
  */
 RecordInfo validateRecord(ByteRange range, uint32_t fileId);
 
-}  // namespace recordio_helpers
+} // namespace recordio_helpers
 
-}  // namespaces
+} // namespace folly
 
 #include <folly/io/RecordIO-inl.h>

diff --git a/folly/io/ShutdownSocketSet.cpp b/folly/io/ShutdownSocketSet.cpp
index 839fd3869882b22748c8255906442a8dad649f4a..09988e7a2593471f15fd019c164f5667d938055d 100644 (file)
--- a/folly/io/ShutdownSocketSet.cpp
+++ b/folly/io/ShutdownSocketSet.cpp
@@ -176,4 +176,4 @@ void ShutdownSocketSet::doShutdown(int fd, bool abortive) {
   folly::dup2NoInt(nullFile_.fd(), fd);
 }
 
-}  // namespaces
+} // namespace folly

diff --git a/folly/io/ShutdownSocketSet.h b/folly/io/ShutdownSocketSet.h
index f74bf48a66a722fddfa2692d5a953704d8f8fffd..7d0853c216e5e53204d22360b74f32e4a8330e50 100644 (file)
--- a/folly/io/ShutdownSocketSet.h
+++ b/folly/io/ShutdownSocketSet.h
@@ -117,4 +117,4 @@ class ShutdownSocketSet : private boost::noncopyable {
   folly::File nullFile_;
 };
 
-}  // namespaces
+} // namespace folly

diff --git a/folly/io/TypedIOBuf.h b/folly/io/TypedIOBuf.h
index 9358cd4dfa61b34d1749339ca05fc487eba23f33..86df07c44135d9e367812ce0584182e470de9ff6 100644 (file)
--- a/folly/io/TypedIOBuf.h
+++ b/folly/io/TypedIOBuf.h
@@ -212,4 +212,4 @@ class TypedIOBuf {
   IOBuf* buf_;
 };
 
-}  // namespace folly
+} // namespace folly

diff --git a/folly/io/test/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp
index e15a18da39f459c40086ef04ba25af06a626ac17..55514e86263870e63ffaa22c13ae2953b3219b38 100644 (file)
--- a/folly/io/test/CompressionTest.cpp
+++ b/folly/io/test/CompressionTest.cpp
@@ -38,7 +38,9 @@
 #include <zstd.h>
 #endif
 
-namespace folly { namespace io { namespace test {
+namespace folly {
+namespace io {
+namespace test {
 
 class DataHolder : private boost::noncopyable {
  public:
@@ -1127,7 +1129,9 @@ TEST(ZstdTest, BackwardCompatible) {
 }
 
 #endif
-}}}  // namespaces
+} // namespace test
+} // namespace io
+} // namespace folly
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);

diff --git a/folly/io/test/IOBufCursorTest.cpp b/folly/io/test/IOBufCursorTest.cpp
index 68aa7784b1cb5d6e2231d152f60a7724bb57b959..22c2a76d91013b5ed8d74e9d2251749e2351cd05 100644 (file)
--- a/folly/io/test/IOBufCursorTest.cpp
+++ b/folly/io/test/IOBufCursorTest.cpp
@@ -190,7 +190,7 @@ std::string toString(const IOBuf& buf) {
   return str;
 }
 
-}  // namespace
+} // namespace
 
 TEST(IOBuf, PullAndPeek) {
   std::unique_ptr<IOBuf> iobuf1(IOBuf::create(10));

diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
index e33287bb5aa55d5c1d244f00d76a3c7e03ae4e26..9fd353f44d4bfd44bcda611852ab42aa63c4893a 100644 (file)
--- a/folly/io/test/IOBufTest.cpp
+++ b/folly/io/test/IOBufTest.cpp
@@ -755,7 +755,7 @@ void customDeleteArray(OwnershipTestClass* p) {
   delete[] p;
 }
 
-}  // namespace
+} // namespace
 
 TEST(IOBuf, takeOwnershipUniquePtr) {
   destructorCount = 0;
@@ -1041,7 +1041,7 @@ namespace {
 std::unique_ptr<IOBuf> fromStr(StringPiece sp) {
   return IOBuf::copyBuffer(ByteRange(sp));
 }
-}  // namespace
+} // namespace
 
 TEST(IOBuf, HashAndEqual) {
   folly::IOBufEqual eq;
@@ -1240,7 +1240,7 @@ char* writableStr(folly::IOBuf& buf) {
   return reinterpret_cast<char*>(buf.writableData());
 }
 
-}  // namespace
+} // namespace
 
 TEST(IOBuf, ExternallyShared) {
   struct Item {

diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index d8a8d5aaae0201f6c71b40a2550ed419a09c4993..4702911c87405b838a7023cdc55da8e5fd4a0ed4 100644 (file)
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -33,7 +33,8 @@
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
-namespace folly { namespace test {
+namespace folly {
+namespace test {
 
 namespace {
 // shortcut
@@ -49,7 +50,7 @@ std::unique_ptr<IOBuf> iobufs(std::initializer_list<T> ranges) {
   return queue.move();
 }
 
-}  // namespace
+} // namespace
 
 TEST(RecordIOTest, Simple) {
   TemporaryFile file;
@@ -189,7 +190,7 @@ void corrupt(int fd, off_t pos) {
   ++val;
   EXPECT_EQ(1, pwrite(fd, &val, 1, pos));
 }
-}  // namespace
+} // namespace
 
 TEST(RecordIOTest, Randomized) {
   SCOPED_TRACE(to<std::string>("Random seed is ", FLAGS_random_seed));
@@ -262,8 +263,9 @@ TEST(RecordIOTest, Randomized) {
     EXPECT_EQ(records.size(), i);
   }
 }
+} // namespace test
+} // namespace folly
 
-}}  // namespaces
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);

diff --git a/folly/io/test/ShutdownSocketSetTest.cpp b/folly/io/test/ShutdownSocketSetTest.cpp
index ae28203bc0ce64dc85964e65765a80a685385fb7..ed478b3ade081ef09d9a3f8759ebc418244a3806 100644 (file)
--- a/folly/io/test/ShutdownSocketSetTest.cpp
+++ b/folly/io/test/ShutdownSocketSetTest.cpp
@@ -28,7 +28,8 @@ using folly::ShutdownSocketSet;
 
 namespace fsp = folly::portability::sockets;
 
-namespace folly { namespace test {
+namespace folly {
+namespace test {
 
 ShutdownSocketSet shutdownSocketSet;
 
@@ -221,5 +222,5 @@ TEST(ShutdownSocketSetTest, OrderlyKill) {
 TEST(ShutdownSocketSetTest, AbortiveKill) {
   runKillTest(true);
 }
-
-}}  // namespaces
+} // namespace test
+} // namespace folly