From 697eb8a6fddf46a43277fee81d8719e71b1f7c1a Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 26 Jan 2018 11:17:36 -0800 Subject: [PATCH] run clang-format across eden Summary: ``` find . \( -iname '*.cpp' -o -iname '*.h' \) -exec arc lint --apply-patches {} + ``` Differential Revision: D6820436 fbshipit-source-id: 173c0e3b5c023c1c9276f34e17d732f1dd161892 --- eden/fs/config/ClientConfig.cpp | 1 - eden/fs/config/ClientConfig.h | 1 - eden/fs/fuse/FuseChannel.cpp | 1 - eden/fs/fuse/RequestData.cpp | 3 +- eden/fs/fuse/privhelper/PrivHelperConn.cpp | 4 +- .../fuse/privhelper/test/PrivHelperTest.cpp | 2 +- eden/fs/inodes/CheckoutAction.cpp | 4 +- eden/fs/inodes/DeferredDiffEntry.cpp | 2 +- eden/fs/inodes/EdenMount.cpp | 159 +++++++++--------- eden/fs/inodes/FileInode.cpp | 4 +- eden/fs/inodes/InodeMap.cpp | 2 +- eden/fs/inodes/Overlay.cpp | 2 +- eden/fs/inodes/TreeInode.cpp | 2 +- eden/fs/inodes/test/CheckoutTest.cpp | 4 +- eden/fs/inodes/test/DiffTest.cpp | 2 +- eden/fs/inodes/test/EdenMountTest.cpp | 2 +- eden/fs/inodes/test/OverlayTest.cpp | 2 +- eden/fs/model/Hash.cpp | 2 +- eden/fs/service/EdenServer.cpp | 3 +- eden/fs/service/EdenServiceHandler.cpp | 2 +- eden/fs/service/GlobNode.cpp | 2 +- eden/fs/store/git/GitBackingStore.cpp | 2 +- eden/fs/store/hg/HgBackingStore.cpp | 2 +- eden/fs/store/hg/HgImporter.cpp | 4 +- .../store/mononoke/MononokeBackingStore.cpp | 4 +- eden/fs/store/test/LocalStoreTest.cpp | 2 +- eden/fs/takeover/TakeoverData.cpp | 2 +- eden/fs/takeover/TakeoverServer.cpp | 6 +- eden/fs/takeover/test/TakeoverTest.cpp | 6 +- eden/fs/testharness/FakeBackingStore.cpp | 2 +- eden/fs/testharness/TestMount.cpp | 2 +- eden/fs/utils/FutureUnixSocket.cpp | 6 +- eden/fs/utils/UnixSocket.cpp | 12 +- eden/fs/utils/test/IoFutureTest.cpp | 2 +- eden/fs/utils/test/UnixSocketTest.cpp | 6 +- 35 files changed, 129 insertions(+), 135 deletions(-) diff --git a/eden/fs/config/ClientConfig.cpp b/eden/fs/config/ClientConfig.cpp index cabe7b42e2..e10b32e344 100644 --- a/eden/fs/config/ClientConfig.cpp +++ b/eden/fs/config/ClientConfig.cpp @@ -119,7 +119,6 @@ ParentCommits ClientConfig::getParentCommits() const { } void ClientConfig::setParentCommits(const ParentCommits& parents) const { - std::array buffer; IOBuf buf(IOBuf::WRAP_BUFFER, ByteRange{buffer}); folly::io::RWPrivateCursor cursor{&buf}; diff --git a/eden/fs/config/ClientConfig.h b/eden/fs/config/ClientConfig.h index dedb1a779a..e1dc47f88c 100644 --- a/eden/fs/config/ClientConfig.h +++ b/eden/fs/config/ClientConfig.h @@ -38,7 +38,6 @@ inline void operator<<(std::ostream& out, const BindMount& bindMount) { class ClientConfig { public: - /** * Manually construct a ClientConfig object. * diff --git a/eden/fs/fuse/FuseChannel.cpp b/eden/fs/fuse/FuseChannel.cpp index 830bc529b1..d20e6ac10a 100644 --- a/eden/fs/fuse/FuseChannel.cpp +++ b/eden/fs/fuse/FuseChannel.cpp @@ -1176,7 +1176,6 @@ folly::Future FuseChannel::fuseCreate( XLOG(DBG7) << "FUSE_CREATE " << name; return dispatcher_->create(header->nodeid, name, create->mode, create->flags) .then([this](Dispatcher::Create info) { - fuse_open_out out = {}; if (info.fh->usesDirectIO()) { out.open_flags |= FOPEN_DIRECT_IO; diff --git a/eden/fs/fuse/RequestData.cpp b/eden/fs/fuse/RequestData.cpp index 2d2e0da65f..b47154b27d 100644 --- a/eden/fs/fuse/RequestData.cpp +++ b/eden/fs/fuse/RequestData.cpp @@ -25,8 +25,7 @@ RequestData::RequestData( FuseChannel* channel, const fuse_in_header& fuseHeader, Dispatcher* dispatcher) - : channel_(channel), fuseHeader_(fuseHeader), dispatcher_(dispatcher) { -} + : channel_(channel), fuseHeader_(fuseHeader), dispatcher_(dispatcher) {} RequestData::~RequestData() { channel_->finishRequest(fuseHeader_); diff --git a/eden/fs/fuse/privhelper/PrivHelperConn.cpp b/eden/fs/fuse/privhelper/PrivHelperConn.cpp index d28039d02a..561669d83d 100644 --- a/eden/fs/fuse/privhelper/PrivHelperConn.cpp +++ b/eden/fs/fuse/privhelper/PrivHelperConn.cpp @@ -25,12 +25,12 @@ #include "eden/fs/utils/ControlMsg.h" using folly::ByteRange; +using folly::checkUnixError; using folly::IOBuf; using folly::StringPiece; -using folly::checkUnixError; +using folly::throwSystemError; using folly::io::Appender; using folly::io::Cursor; -using folly::throwSystemError; using std::string; DEFINE_int32( diff --git a/eden/fs/fuse/privhelper/test/PrivHelperTest.cpp b/eden/fs/fuse/privhelper/test/PrivHelperTest.cpp index ea6002280b..d84d394cea 100644 --- a/eden/fs/fuse/privhelper/test/PrivHelperTest.cpp +++ b/eden/fs/fuse/privhelper/test/PrivHelperTest.cpp @@ -27,10 +27,10 @@ using namespace folly::string_piece_literals; using namespace facebook::eden::fusell; using facebook::eden::UserInfo; using folly::ByteRange; +using folly::checkUnixError; using folly::File; using folly::IOBuf; using folly::StringPiece; -using folly::checkUnixError; using folly::test::TemporaryDirectory; using folly::test::TemporaryFile; using std::string; diff --git a/eden/fs/inodes/CheckoutAction.cpp b/eden/fs/inodes/CheckoutAction.cpp index 12fa1237cb..12d28c1541 100644 --- a/eden/fs/inodes/CheckoutAction.cpp +++ b/eden/fs/inodes/CheckoutAction.cpp @@ -21,10 +21,10 @@ #include "eden/fs/service/gen-cpp2/eden_types.h" #include "eden/fs/store/ObjectStore.h" -using folly::Future; -using folly::Unit; using folly::exception_wrapper; +using folly::Future; using folly::makeFuture; +using folly::Unit; using std::make_shared; using std::vector; diff --git a/eden/fs/inodes/DeferredDiffEntry.cpp b/eden/fs/inodes/DeferredDiffEntry.cpp index 09ad997ab4..07485fc44e 100644 --- a/eden/fs/inodes/DeferredDiffEntry.cpp +++ b/eden/fs/inodes/DeferredDiffEntry.cpp @@ -23,8 +23,8 @@ #include "eden/fs/utils/Bug.h" using folly::Future; -using folly::Unit; using folly::makeFuture; +using folly::Unit; using std::make_unique; using std::shared_ptr; using std::unique_ptr; diff --git a/eden/fs/inodes/EdenMount.cpp b/eden/fs/inodes/EdenMount.cpp index 10ba13ed5f..8d6ecde27f 100644 --- a/eden/fs/inodes/EdenMount.cpp +++ b/eden/fs/inodes/EdenMount.cpp @@ -41,20 +41,19 @@ #include "eden/fs/utils/Bug.h" #include "eden/fs/utils/Clock.h" +using facebook::eden::fusell::FuseChannelData; using folly::Future; -using folly::StringPiece; -using folly::Unit; -using folly::Unit; using folly::makeFuture; using folly::setThreadName; +using folly::StringPiece; using folly::to; -using std::chrono::system_clock; +using folly::Unit; using std::make_shared; using std::make_unique; using std::shared_ptr; using std::unique_ptr; using std::vector; -using facebook::eden::fusell::FuseChannelData; +using std::chrono::system_clock; DEFINE_int32(fuseNumThreads, 16, "how many fuse dispatcher threads to spawn"); @@ -505,13 +504,12 @@ folly::Future> EdenMount::checkout( // Perform the requested checkout operation after the journal diff // completes. - return journalDiffFuture.then( - [this, ctx, fromTree, toTree]() { - ctx->start(this->acquireRenameLock()); - return this->getRootInode() - ->checkout(ctx.get(), fromTree, toTree) - .then([toTree]() mutable { return toTree; }); - }); + return journalDiffFuture.then([this, ctx, fromTree, toTree]() { + ctx->start(this->acquireRenameLock()); + return this->getRootInode() + ->checkout(ctx.get(), fromTree, toTree) + .then([toTree]() mutable { return toTree; }); + }); }) .then([this, ctx, oldParents, snapshotHash, journalDiffCallback]( std::shared_ptr toTree) { @@ -671,85 +669,86 @@ folly::Future EdenMount::startFuse( folly::EventBase* eventBase, std::shared_ptr threadPool, folly::Optional takeoverData) { - return folly::makeFutureWith([this, - eventBase, - threadPool, - takeoverData = - std::move(takeoverData)]() mutable { - if (!doStateTransition(State::UNINITIALIZED, State::STARTING)) { - throw std::runtime_error("mount point has already been started"); - } + return folly::makeFutureWith( + [this, + eventBase, + threadPool, + takeoverData = std::move(takeoverData)]() mutable { + if (!doStateTransition(State::UNINITIALIZED, State::STARTING)) { + throw std::runtime_error("mount point has already been started"); + } - eventBase_ = eventBase; - threadPool_ = threadPool; + eventBase_ = eventBase; + threadPool_ = threadPool; - folly::File fuseDevice; - folly::Optional connInfo; + folly::File fuseDevice; + folly::Optional connInfo; - if (takeoverData.hasValue()) { - auto& channelData = takeoverData.value(); - fuseDevice = std::move(channelData.fd); - connInfo = channelData.connInfo; - } else { - fuseDevice = fusell::privilegedFuseMount(path_.stringPiece()); - } + if (takeoverData.hasValue()) { + auto& channelData = takeoverData.value(); + fuseDevice = std::move(channelData.fd); + connInfo = channelData.connInfo; + } else { + fuseDevice = fusell::privilegedFuseMount(path_.stringPiece()); + } - channel_ = std::make_unique( - std::move(fuseDevice), - path_, - eventBase_, - FLAGS_fuseNumThreads, - dispatcher_.get(), - connInfo); + channel_ = std::make_unique( + std::move(fuseDevice), + path_, + eventBase_, + FLAGS_fuseNumThreads, + dispatcher_.get(), + connInfo); - // we'll use this shortly to wait until the mount is started successfully. - auto initFuture = initFusePromise_.getFuture(); + // we'll use this shortly to wait until the mount is started + // successfully. + auto initFuture = initFusePromise_.getFuture(); - channel_->getThreadsStoppingFuture().then([this] { - // If threads are stopping before we got as far as setting the state to - // RUNNING, we must have experienced an error - if (doStateTransition(State::STARTING, State::FUSE_ERROR)) { - initFusePromise_.setException( - std::runtime_error("fuse session failed to initialize")); - } else { - // If we were RUNNING and a thread stopped, then record - // that transition to FUSE_DONE. - doStateTransition(State::RUNNING, State::FUSE_DONE); - } - }); + channel_->getThreadsStoppingFuture().then([this] { + // If threads are stopping before we got as far as setting the state + // to RUNNING, we must have experienced an error + if (doStateTransition(State::STARTING, State::FUSE_ERROR)) { + initFusePromise_.setException( + std::runtime_error("fuse session failed to initialize")); + } else { + // If we were RUNNING and a thread stopped, then record + // that transition to FUSE_DONE. + doStateTransition(State::RUNNING, State::FUSE_DONE); + } + }); - channel_->getSessionCompleteFuture().then([this] { - // In case we are performing a graceful restart, - // extract the fuse device now. - auto channelData = channel_->stealFuseDevice(); - channel_.reset(); + channel_->getSessionCompleteFuture().then([this] { + // In case we are performing a graceful restart, + // extract the fuse device now. + auto channelData = channel_->stealFuseDevice(); + channel_.reset(); - std::vector bindMounts; - for (const auto& entry : bindMounts_) { - bindMounts.push_back(entry.pathInMountDir); - } + std::vector bindMounts; + for (const auto& entry : bindMounts_) { + bindMounts.push_back(entry.pathInMountDir); + } - fuseCompletionPromise_.setValue(TakeoverData::MountInfo( - path_, - config_->getClientDirectory(), - bindMounts, - std::move(channelData.fd), - channelData.connInfo, - SerializedFileHandleMap{}, // placeholder - SerializedInodeMap{} // placeholder - )); - }); + fuseCompletionPromise_.setValue(TakeoverData::MountInfo( + path_, + config_->getClientDirectory(), + bindMounts, + std::move(channelData.fd), + channelData.connInfo, + SerializedFileHandleMap{}, // placeholder + SerializedInodeMap{} // placeholder + )); + }); - if (takeoverData.hasValue()) { - // When doing takeover, we are immediately ready. - doStateTransition(State::STARTING, State::RUNNING); - initFusePromise_.setValue(); - } + if (takeoverData.hasValue()) { + // When doing takeover, we are immediately ready. + doStateTransition(State::STARTING, State::RUNNING); + initFusePromise_.setValue(); + } - // wait for init to complete or error; this will throw an exception - // if the init procedure failed. - return initFuture; - }); + // wait for init to complete or error; this will throw an exception + // if the init procedure failed. + return initFuture; + }); } void EdenMount::mountStarted() { diff --git a/eden/fs/inodes/FileInode.cpp b/eden/fs/inodes/FileInode.cpp index 4b75755cc0..5e52a11570 100644 --- a/eden/fs/inodes/FileInode.cpp +++ b/eden/fs/inodes/FileInode.cpp @@ -31,11 +31,11 @@ #include "eden/fs/utils/XAttr.h" using folly::ByteRange; +using folly::checkUnixError; using folly::Future; +using folly::makeFuture; using folly::StringPiece; using folly::Unit; -using folly::checkUnixError; -using folly::makeFuture; using std::shared_ptr; using std::string; using std::vector; diff --git a/eden/fs/inodes/InodeMap.cpp b/eden/fs/inodes/InodeMap.cpp index 13749e3f32..ec86fa5577 100644 --- a/eden/fs/inodes/InodeMap.cpp +++ b/eden/fs/inodes/InodeMap.cpp @@ -23,8 +23,8 @@ using folly::Future; using folly::Promise; -using folly::Unit; using folly::throwSystemErrorExplicit; +using folly::Unit; using std::string; namespace facebook { diff --git a/eden/fs/inodes/Overlay.cpp b/eden/fs/inodes/Overlay.cpp index 7658240a67..b66279d2e9 100644 --- a/eden/fs/inodes/Overlay.cpp +++ b/eden/fs/inodes/Overlay.cpp @@ -23,11 +23,11 @@ namespace eden { using apache::thrift::CompactSerializer; using folly::ByteRange; +using folly::fbvector; using folly::File; using folly::MutableStringPiece; using folly::Optional; using folly::StringPiece; -using folly::fbvector; using std::make_unique; using std::string; using std::unique_ptr; diff --git a/eden/fs/inodes/TreeInode.cpp b/eden/fs/inodes/TreeInode.cpp index 2114308470..a92f43c0d2 100644 --- a/eden/fs/inodes/TreeInode.cpp +++ b/eden/fs/inodes/TreeInode.cpp @@ -46,10 +46,10 @@ #include "eden/fs/utils/UnboundedQueueThreadPool.h" using folly::Future; +using folly::makeFuture; using folly::Optional; using folly::StringPiece; using folly::Unit; -using folly::makeFuture; using std::make_unique; using std::shared_ptr; using std::unique_ptr; diff --git a/eden/fs/inodes/test/CheckoutTest.cpp b/eden/fs/inodes/test/CheckoutTest.cpp index 59f2232ac6..98f4732c1a 100644 --- a/eden/fs/inodes/test/CheckoutTest.cpp +++ b/eden/fs/inodes/test/CheckoutTest.cpp @@ -29,12 +29,12 @@ using namespace facebook::eden; using namespace std::chrono_literals; using folly::Future; +using folly::makeFuture; using folly::Optional; using folly::StringPiece; using folly::Unit; -using folly::makeFuture; -using std::chrono::system_clock; using std::string; +using std::chrono::system_clock; using testing::UnorderedElementsAre; namespace std { diff --git a/eden/fs/inodes/test/DiffTest.cpp b/eden/fs/inodes/test/DiffTest.cpp index 57ea5921b4..3c086b63a3 100644 --- a/eden/fs/inodes/test/DiffTest.cpp +++ b/eden/fs/inodes/test/DiffTest.cpp @@ -25,9 +25,9 @@ #include "eden/fs/testharness/TestUtil.h" using namespace facebook::eden; -using ::testing::UnorderedElementsAre; using folly::StringPiece; using std::string; +using ::testing::UnorderedElementsAre; class DiffResults { public: diff --git a/eden/fs/inodes/test/EdenMountTest.cpp b/eden/fs/inodes/test/EdenMountTest.cpp index ba8ee8b4bd..26a94ac967 100644 --- a/eden/fs/inodes/test/EdenMountTest.cpp +++ b/eden/fs/inodes/test/EdenMountTest.cpp @@ -10,8 +10,8 @@ #include "eden/fs/inodes/EdenMount.h" #include -#include #include +#include #include #include "eden/fs/config/ClientConfig.h" diff --git a/eden/fs/inodes/test/OverlayTest.cpp b/eden/fs/inodes/test/OverlayTest.cpp index 52eea8db1e..dc1b63ba60 100644 --- a/eden/fs/inodes/test/OverlayTest.cpp +++ b/eden/fs/inodes/test/OverlayTest.cpp @@ -24,8 +24,8 @@ using namespace facebook::eden; using folly::Future; -using folly::StringPiece; using folly::makeFuture; +using folly::StringPiece; using std::string; class OverlayTest : public ::testing::Test { diff --git a/eden/fs/model/Hash.cpp b/eden/fs/model/Hash.cpp index e4110e1ac9..8adc84d9d6 100644 --- a/eden/fs/model/Hash.cpp +++ b/eden/fs/model/Hash.cpp @@ -18,8 +18,8 @@ #include using folly::ByteRange; -using folly::StringPiece; using folly::range; +using folly::StringPiece; using folly::ssl::OpenSSLHash; using std::string; diff --git a/eden/fs/service/EdenServer.cpp b/eden/fs/service/EdenServer.cpp index de6b2e7b6b..8d805d82cc 100644 --- a/eden/fs/service/EdenServer.cpp +++ b/eden/fs/service/EdenServer.cpp @@ -77,10 +77,10 @@ using apache::thrift::ThriftServer; using facebook::eden::fusell::FuseChannelData; using folly::File; using folly::Future; +using folly::makeFuture; using folly::Optional; using folly::StringPiece; using folly::Unit; -using folly::makeFuture; using std::make_shared; using std::shared_ptr; using std::string; @@ -568,7 +568,6 @@ folly::Future> EdenServer::mount( doTakeover, edenMount, optionalTakeover = std::move(optionalTakeover)]() mutable { - addToMountPoints(edenMount); return (optionalTakeover ? performTakeoverFuseStart( diff --git a/eden/fs/service/EdenServiceHandler.cpp b/eden/fs/service/EdenServiceHandler.cpp index 3a26aa4587..f6743f7149 100644 --- a/eden/fs/service/EdenServiceHandler.cpp +++ b/eden/fs/service/EdenServiceHandler.cpp @@ -43,9 +43,9 @@ #include "eden/fs/store/ObjectStore.h" using folly::Future; +using folly::makeFuture; using folly::Optional; using folly::StringPiece; -using folly::makeFuture; using std::make_unique; using std::string; using std::unique_ptr; diff --git a/eden/fs/service/GlobNode.cpp b/eden/fs/service/GlobNode.cpp index e344cd5abe..bf6d9593bd 100644 --- a/eden/fs/service/GlobNode.cpp +++ b/eden/fs/service/GlobNode.cpp @@ -12,8 +12,8 @@ #include "eden/fs/inodes/TreeInode.h" using folly::Future; -using folly::StringPiece; using folly::makeFuture; +using folly::StringPiece; using std::make_unique; using std::string; using std::unique_ptr; diff --git a/eden/fs/store/git/GitBackingStore.cpp b/eden/fs/store/git/GitBackingStore.cpp index ce78ce3abb..56af86f75b 100644 --- a/eden/fs/store/git/GitBackingStore.cpp +++ b/eden/fs/store/git/GitBackingStore.cpp @@ -24,8 +24,8 @@ using folly::ByteRange; using folly::Future; using folly::IOBuf; -using folly::StringPiece; using folly::makeFuture; +using folly::StringPiece; using std::make_unique; using std::string; using std::unique_ptr; diff --git a/eden/fs/store/hg/HgBackingStore.cpp b/eden/fs/store/hg/HgBackingStore.cpp index 0bc85b6944..d30405b409 100644 --- a/eden/fs/store/hg/HgBackingStore.cpp +++ b/eden/fs/store/hg/HgBackingStore.cpp @@ -24,8 +24,8 @@ using folly::ByteRange; using folly::Future; -using folly::StringPiece; using folly::makeFuture; +using folly::StringPiece; using std::make_unique; using std::unique_ptr; using KeySpace = facebook::eden::LocalStore::KeySpace; diff --git a/eden/fs/store/hg/HgImporter.cpp b/eden/fs/store/hg/HgImporter.cpp index 6d569dbe50..170bc1df20 100644 --- a/eden/fs/store/hg/HgImporter.cpp +++ b/eden/fs/store/hg/HgImporter.cpp @@ -33,8 +33,8 @@ #include "eden/fs/utils/PathFuncs.h" #include "eden/fs/utils/TimeUtil.h" -#include "hgext/extlib/cstore/uniondatapackstore.h" -#include "hgext/extlib/ctreemanifest/treemanifest.h" +#include "hgext/extlib/cstore/uniondatapackstore.h" // @manual=//scm/hg:datapack +#include "hgext/extlib/ctreemanifest/treemanifest.h" // @manual=//scm/hg:datapack using folly::ByteRange; using folly::Endian; diff --git a/eden/fs/store/mononoke/MononokeBackingStore.cpp b/eden/fs/store/mononoke/MononokeBackingStore.cpp index a2d77f9ac2..0b3f28a360 100644 --- a/eden/fs/store/mononoke/MononokeBackingStore.cpp +++ b/eden/fs/store/mononoke/MononokeBackingStore.cpp @@ -23,15 +23,15 @@ using folly::Future; using folly::IOBuf; -using folly::makeFuture; using folly::make_exception_wrapper; +using folly::makeFuture; using proxygen::ErrorCode; using proxygen::HTTPException; using proxygen::HTTPHeaders; using proxygen::HTTPMessage; using proxygen::HTTPTransaction; -using proxygen::URL; using proxygen::UpgradeProtocol; +using proxygen::URL; namespace facebook { namespace eden { diff --git a/eden/fs/store/test/LocalStoreTest.cpp b/eden/fs/store/test/LocalStoreTest.cpp index f56ccc6e5b..1a8c93cb9f 100644 --- a/eden/fs/store/test/LocalStoreTest.cpp +++ b/eden/fs/store/test/LocalStoreTest.cpp @@ -24,8 +24,8 @@ using namespace facebook::eden; using folly::IOBuf; using folly::StringPiece; -using folly::test::TemporaryDirectory; using folly::unhexlify; +using folly::test::TemporaryDirectory; using std::string; using KeySpace = facebook::eden::LocalStore::KeySpace; diff --git a/eden/fs/takeover/TakeoverData.cpp b/eden/fs/takeover/TakeoverData.cpp index d536889084..ee1fd1aff8 100644 --- a/eden/fs/takeover/TakeoverData.cpp +++ b/eden/fs/takeover/TakeoverData.cpp @@ -14,9 +14,9 @@ #include #include +using apache::thrift::CompactSerializer; using folly::IOBuf; using std::string; -using apache::thrift::CompactSerializer; namespace facebook { namespace eden { diff --git a/eden/fs/takeover/TakeoverServer.cpp b/eden/fs/takeover/TakeoverServer.cpp index e3512e2116..5578d8d94b 100644 --- a/eden/fs/takeover/TakeoverServer.cpp +++ b/eden/fs/takeover/TakeoverServer.cpp @@ -28,13 +28,13 @@ using namespace std::literals::chrono_literals; using folly::AsyncServerSocket; +using folly::checkUnixError; +using folly::exceptionStr; using folly::Future; +using folly::makeFuture; using folly::SocketAddress; using folly::StringPiece; using folly::Unit; -using folly::checkUnixError; -using folly::exceptionStr; -using folly::makeFuture; using std::make_unique; namespace facebook { diff --git a/eden/fs/takeover/test/TakeoverTest.cpp b/eden/fs/takeover/test/TakeoverTest.cpp index 3a38c4af88..60add58c81 100644 --- a/eden/fs/takeover/test/TakeoverTest.cpp +++ b/eden/fs/takeover/test/TakeoverTest.cpp @@ -21,14 +21,14 @@ #include "eden/fs/takeover/TakeoverServer.h" using namespace facebook::eden; -using ::testing::ElementsAre; -using ::testing::ElementsAreArray; using folly::EventBase; using folly::Future; -using folly::Promise; using folly::makeFuture; +using folly::Promise; using folly::test::TemporaryDirectory; using std::string; +using ::testing::ElementsAre; +using ::testing::ElementsAreArray; using namespace std::literals::chrono_literals; namespace { diff --git a/eden/fs/testharness/FakeBackingStore.cpp b/eden/fs/testharness/FakeBackingStore.cpp index cc0e021914..15a92165b9 100644 --- a/eden/fs/testharness/FakeBackingStore.cpp +++ b/eden/fs/testharness/FakeBackingStore.cpp @@ -23,8 +23,8 @@ using folly::ByteRange; using folly::Future; using folly::IOBuf; -using folly::StringPiece; using folly::makeFuture; +using folly::StringPiece; using std::make_unique; using std::unique_ptr; diff --git a/eden/fs/testharness/TestMount.cpp b/eden/fs/testharness/TestMount.cpp index c7de0b22b7..d8a0772515 100644 --- a/eden/fs/testharness/TestMount.cpp +++ b/eden/fs/testharness/TestMount.cpp @@ -32,9 +32,9 @@ using folly::ByteRange; using folly::Future; +using folly::makeFuture; using folly::StringPiece; using folly::Unit; -using folly::makeFuture; using folly::test::TemporaryDirectory; using folly::test::TemporaryFile; using std::make_shared; diff --git a/eden/fs/utils/FutureUnixSocket.cpp b/eden/fs/utils/FutureUnixSocket.cpp index fd5826c528..f76e6f7372 100644 --- a/eden/fs/utils/FutureUnixSocket.cpp +++ b/eden/fs/utils/FutureUnixSocket.cpp @@ -13,12 +13,12 @@ #include #include +using folly::exception_wrapper; using folly::Future; +using folly::make_exception_wrapper; +using folly::makeFuture; using folly::Promise; using folly::Unit; -using folly::exception_wrapper; -using folly::makeFuture; -using folly::make_exception_wrapper; namespace facebook { namespace eden { diff --git a/eden/fs/utils/UnixSocket.cpp b/eden/fs/utils/UnixSocket.cpp index 85b1f686fd..3d872afb41 100644 --- a/eden/fs/utils/UnixSocket.cpp +++ b/eden/fs/utils/UnixSocket.cpp @@ -25,18 +25,18 @@ using folly::ByteRange; using folly::EventBase; +using folly::exception_wrapper; using folly::File; using folly::Future; using folly::IOBuf; -using folly::MutableByteRange; -using folly::Unit; -using folly::exception_wrapper; -using folly::io::Cursor; -using folly::io::RWPrivateCursor; -using folly::makeSystemError; using folly::make_exception_wrapper; +using folly::makeSystemError; +using folly::MutableByteRange; using folly::throwSystemError; using folly::throwSystemErrorExplicit; +using folly::Unit; +using folly::io::Cursor; +using folly::io::RWPrivateCursor; using std::unique_ptr; using std::vector; diff --git a/eden/fs/utils/test/IoFutureTest.cpp b/eden/fs/utils/test/IoFutureTest.cpp index db44a9c053..cdd228f89e 100644 --- a/eden/fs/utils/test/IoFutureTest.cpp +++ b/eden/fs/utils/test/IoFutureTest.cpp @@ -19,9 +19,9 @@ using facebook::eden::IoFuture; using facebook::eden::waitForIO; +using folly::checkUnixError; using folly::EventBase; using folly::EventHandler; -using folly::checkUnixError; using namespace std::chrono_literals; namespace { diff --git a/eden/fs/utils/test/UnixSocketTest.cpp b/eden/fs/utils/test/UnixSocketTest.cpp index 51860d4390..2107bc71a4 100644 --- a/eden/fs/utils/test/UnixSocketTest.cpp +++ b/eden/fs/utils/test/UnixSocketTest.cpp @@ -23,13 +23,13 @@ #include using folly::ByteRange; +using folly::checkUnixError; +using folly::errnoStr; using folly::EventBase; using folly::File; using folly::IOBuf; -using folly::StringPiece; -using folly::checkUnixError; -using folly::errnoStr; using folly::makeFuture; +using folly::StringPiece; using folly::test::TemporaryFile; using std::make_unique; using namespace std::chrono_literals;