Apply clang-format to folly/gen/ (partial: namespace)

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

With some manual rearrangement in the places where `clang-format` does awkward things, with the result that clang-format over `folly/gen/` becomes a no-op.

Reviewed By: Orvid

Differential Revision: D5177428

fbshipit-source-id: 17f51d00454a7be7f29dcf1a2ff3d0eaf1de72ab

diff --git a/folly/gen/Base-inl.h b/folly/gen/Base-inl.h
index 66d2b92c3dec49617e2e73daded85006f1d4dd92..959696e8068407e93ad675b378e240d08d19b1fc 100644 (file)
--- a/folly/gen/Base-inl.h
+++ b/folly/gen/Base-inl.h
@@ -22,7 +22,8 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 
 /**
  * ArgumentReference - For determining ideal argument type to receive a value.
@@ -2336,7 +2337,7 @@ inline detail::Skip skip(size_t count) { return detail::Skip(count); }
 inline detail::Batch batch(size_t batchSize) {
   return detail::Batch(batchSize);
 }
-
-}} // folly::gen
+} // gen
+} // folly
 
 #pragma GCC diagnostic pop

diff --git a/folly/gen/Base.h b/folly/gen/Base.h
index a5d4b05a2e1166bd549dee6aa1908760f459b8f0..cf3eca135dda3546d26789c39dea9a925c95efe5 100644 (file)
--- a/folly/gen/Base.h
+++ b/folly/gen/Base.h
@@ -78,9 +78,10 @@
  *
  * To learn more about this library, including the use of infinite generators,
  * see the examples in the comments, or the docs (coming soon).
-*/
+ */
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 
 class Less {
 public:
@@ -814,7 +815,7 @@ template<class Fallback,
 UnwrapOr unwrapOr(Fallback&& fallback) {
   return UnwrapOr(std::forward<Fallback>(fallback));
 }
-
-}} // folly::gen
+} // gen
+} // folly
 
 #include <folly/gen/Base-inl.h>

diff --git a/folly/gen/Combine-inl.h b/folly/gen/Combine-inl.h
index 58daf078792fba5bc43bb0c2e5b610d5fc85aa2c..4e293d117ece2b1b4e36e74dcaccb44a7547643e 100644 (file)
--- a/folly/gen/Combine-inl.h
+++ b/folly/gen/Combine-inl.h
@@ -201,7 +201,7 @@ class MergeTuples {
   }
 };
 
-}  // namespace detail
+} // namespace detail
 
 // TODO(mcurtiss): support zip() for N>1 operands. Because of variadic problems,
 // this might not be easily possible until gcc4.8 is available.
@@ -211,5 +211,5 @@ Zip zip(Source&& source) {
   return Zip(std::forward<Source>(source));
 }
 
-}  // namespace gen
-}  // namespace folly
+} // namespace gen
+} // namespace folly

diff --git a/folly/gen/Combine.h b/folly/gen/Combine.h
index c665efce17b657880238601e3cfc6c70de49d8fc..42ca358f3f25b15219f06149ecafc49a33facd47 100644 (file)
--- a/folly/gen/Combine.h
+++ b/folly/gen/Combine.h
@@ -29,7 +29,7 @@ class Interleave;
 template<class Container>
 class Zip;
 
-}  // namespace detail
+} // namespace detail
 
 template<class Source2,
          class Source2Decayed = typename std::decay<Source2>::type,
@@ -38,7 +38,7 @@ Interleave interleave(Source2&& source2) {
   return Interleave(std::forward<Source2>(source2));
 }
 
-}  // namespace gen
-}  // namespace folly
+} // namespace gen
+} // namespace folly
 
 #include <folly/gen/Combine-inl.h>

diff --git a/folly/gen/Core-inl.h b/folly/gen/Core-inl.h
index 2868224b6c75720183ec368c7b4e98d8310f3e01..87891e360770365d9a0f2b1e336a7fca4ab5cb87 100644 (file)
--- a/folly/gen/Core-inl.h
+++ b/folly/gen/Core-inl.h
@@ -25,7 +25,8 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 
 /**
  * IsCompatibleSignature - Trait type for testing whether a given Functor
@@ -372,7 +373,7 @@ public:
 };
 
 } // detail
-
-}} // folly::gen
+} // gen
+} // folly
 
 #pragma GCC diagnostic pop

diff --git a/folly/gen/Core.h b/folly/gen/Core.h
index 5181355f9c16848f9d029aba171c6796943ce863..dfd93d62ed28e06e0fe82d00d6349ee55078fccd 100644 (file)
--- a/folly/gen/Core.h
+++ b/folly/gen/Core.h
@@ -17,7 +17,8 @@
 #pragma once
 #define FOLLY_GEN_CORE_H_
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 
 template<class Value, class Self>
 class GenImpl;
@@ -37,7 +38,7 @@ template<class Value, class First, class Second>
 class Chain;
 
 } // detail
-
-}} // folly::gen
+} // gen
+} // folly
 
 #include <folly/gen/Core-inl.h>

diff --git a/folly/gen/File-inl.h b/folly/gen/File-inl.h
index 591ead3497f7bf6c7280c079f37d30c1194af0ff..d098dbd0f7ff89b30b7f0e42a4d65235d35f27ab 100644 (file)
--- a/folly/gen/File-inl.h
+++ b/folly/gen/File-inl.h
@@ -129,7 +129,7 @@ inline auto byLineImpl(File file, char delim, bool keepDelimiter)
     | resplit(delim, keepDelimiter);
 }
 
-}  // !detail
+} // !detail
 
 /**
  * Generator which reads lines from a file.
@@ -161,4 +161,5 @@ inline auto byLine(int fd, char delim = '\n')
 
 inline auto byLine(const char* f, char delim = '\n')
   -> decltype(byLine(File(f), delim)) { return byLine(File(f), delim); }
-}}  // !folly::gen
+} // !gen
+} // !folly

diff --git a/folly/gen/File.h b/folly/gen/File.h
index b5dfc4b32f61d329d7d68bbe56171f7aaf48a48a..4157a07d5dbd6351d7d59fb0de97d89050fabd07 100644 (file)
--- a/folly/gen/File.h
+++ b/folly/gen/File.h
@@ -27,7 +27,7 @@ namespace gen {
 namespace detail {
 class FileReader;
 class FileWriter;
-}  // namespace detail
+} // namespace detail
 
 /**
  * Generator that reads from a file with a buffer of the given size.
@@ -64,7 +64,7 @@ template <class S = detail::FileWriter>
 S toFile(File file, std::unique_ptr<IOBuf> buffer) {
   return S(std::move(file), std::move(buffer));
 }
-
-}}  // !folly::gen
+} // !gen
+} // !folly
 
 #include <folly/gen/File-inl.h>

diff --git a/folly/gen/Parallel.h b/folly/gen/Parallel.h
index d4012d17276ee23872374a771156615db76cdc48..85e956ea3a8ae95151d61f4667e9788d81474f4a 100644 (file)
--- a/folly/gen/Parallel.h
+++ b/folly/gen/Parallel.h
@@ -21,7 +21,8 @@
 
 #include <folly/gen/Base.h>
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 namespace detail {
 
 template <class Ops>
@@ -102,7 +103,7 @@ template <class Sink, class Sub = detail::Sub<Sink>>
 Sub sub(Sink sink) {
   return Sub(std::move(sink));
 }
-
-}} // !namespace folly::gen
+} // !namespace gen
+} // !namespace folly
 
 #include <folly/gen/Parallel-inl.h>

diff --git a/folly/gen/ParallelMap-inl.h b/folly/gen/ParallelMap-inl.h
index 47fd9bcbc654a860eda479cb086ff4db3872d323..7975b21d9b87d904e437ae66841567a2ff1741e4 100644 (file)
--- a/folly/gen/ParallelMap-inl.h
+++ b/folly/gen/ParallelMap-inl.h
@@ -28,7 +28,9 @@
 #include <folly/MPMCPipeline.h>
 #include <folly/experimental/EventCount.h>
 
-namespace folly { namespace gen { namespace detail {
+namespace folly {
+namespace gen {
+namespace detail {
 
 /**
  * PMap - Map in parallel (using threads). For producing a sequence of
@@ -250,5 +252,6 @@ class PMap : public Operator<PMap<Predicate>> {
     return Gen(source.self(), pred_, nThreads_);
   }
 };
-
-}}}  // namespaces
+} // namespace detail
+} // namespace gen
+} // namespace folly

diff --git a/folly/gen/ParallelMap.h b/folly/gen/ParallelMap.h
index 4e9da1ef74de3e70e5ae3093b49549baa9621455..e17acc93651c65a983f3b9b00a4728464956144c 100644 (file)
--- a/folly/gen/ParallelMap.h
+++ b/folly/gen/ParallelMap.h
@@ -19,14 +19,15 @@
 
 #include <folly/gen/Core.h>
 
-namespace folly { namespace gen {
+namespace folly {
+namespace gen {
 
 namespace detail {
 
 template<class Predicate>
 class PMap;
 
-}  // namespace detail
+} // namespace detail
 
 /**
  * Run `pred` in parallel in nThreads. Results are returned in the
@@ -42,7 +43,7 @@ template<class Predicate,
   PMap pmap(Predicate pred = Predicate(), size_t nThreads = 0) {
   return PMap(std::move(pred), nThreads);
 }
-
-}}  // namespaces
+} // namespace gen
+} // namespace folly
 
 #include <folly/gen/ParallelMap-inl.h>

diff --git a/folly/gen/String-inl.h b/folly/gen/String-inl.h
index be9f1d546b3acc2aef7f80bdaff078d124e14c12..64e86f9866a4f455499273bb17d01ec672b1deec 100644 (file)
--- a/folly/gen/String-inl.h
+++ b/folly/gen/String-inl.h
@@ -412,7 +412,7 @@ class SplitTo {
 
 #pragma GCC diagnostic pop
 
-}  // namespace detail
+} // namespace detail
 
-}  // namespace gen
-}  // namespace folly
+} // namespace gen
+} // namespace folly

diff --git a/folly/gen/String.h b/folly/gen/String.h
index fde954a040d8aded84f349e97402f66642c26789..2b8b02cd8218de012be3106aaf9b2801c666e20a 100644 (file)
--- a/folly/gen/String.h
+++ b/folly/gen/String.h
@@ -41,7 +41,7 @@ template<class TargetContainer,
          class... Targets>
 class SplitTo;
 
-}  // namespace detail
+} // namespace detail
 
 /**
  * Split the output from a generator into StringPiece "lines" delimited by
@@ -242,7 +242,7 @@ StreamSplitter<Callback> streamSplitter(char delimiter,
   return StreamSplitter<Callback>(delimiter, std::move(pieceCb), capacity);
 }
 
-}  // namespace gen
-}  // namespace folly
+} // namespace gen
+} // namespace folly
 
 #include <folly/gen/String-inl.h>

diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp
index 999d74b9189f5fcc3467b30444b33a2bd9f5219a..32734719e8d249fd6d1d2d5ea8daa435b03d58c5 100644 (file)
--- a/folly/gen/test/BaseTest.cpp
+++ b/folly/gen/test/BaseTest.cpp
@@ -918,7 +918,7 @@ class TestIntSeq : public GenImpl<int, TestIntSeq> {
   TestIntSeq& operator=(const TestIntSeq&) = delete;
 };
 
-}  // namespace
+} // namespace
 
 TEST(Gen, NoGeneratorCopies) {
   EXPECT_EQ(15, TestIntSeq() | sum);

diff --git a/folly/gen/test/StringBenchmark.cpp b/folly/gen/test/StringBenchmark.cpp
index cffe89c13173604f684b63a92a8400b9648da3d7..c6de1ed43f003579c4dc94ea2d40891b44866529 100644 (file)
--- a/folly/gen/test/StringBenchmark.cpp
+++ b/folly/gen/test/StringBenchmark.cpp
@@ -61,7 +61,7 @@ void initStringResplitterBenchmark() {
 
 size_t len(folly::StringPiece s) { return s.size(); }
 
-}  // namespace
+} // namespace
 
 BENCHMARK(StringResplitter_Big, iters) {
   size_t s = 0;