diff --git a/eden/fs/fuse/FuseChannel.cpp b/eden/fs/fuse/FuseChannel.cpp index 8e6e12a1ae..9efb57511b 100644 --- a/eden/fs/fuse/FuseChannel.cpp +++ b/eden/fs/fuse/FuseChannel.cpp @@ -10,6 +10,7 @@ #include "eden/fs/fuse/FuseChannel.h" #include +#include #include #include #include @@ -546,7 +547,7 @@ std::string capsFlagsToLabel(uint32_t flags) { if (flags == 0) { return str; } - return folly::format("{} unknown:0x{:x}", str, flags).str(); + return fmt::format("{} unknown:0x{:x}", str, flags); } void sigusr2Handler(int /* signum */) { diff --git a/eden/fs/service/EdenServer.cpp b/eden/fs/service/EdenServer.cpp index 221eece96d..622e6ed600 100644 --- a/eden/fs/service/EdenServer.cpp +++ b/eden/fs/service/EdenServer.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -459,13 +460,12 @@ void EdenServer::ProgressManager::printProgresses( content += folly::to("Remounting ", it.mountPath, "\n"); printedFinished++; } else { - content += folly::format( - "[{:21}] {:>3}%: fsck on {}{}", - std::string(it.fsckPercentComplete * 2, '=') + ">", - it.fsckPercentComplete * 10, - it.localDir, - "\n") - .str(); + content += fmt::format( + "[{:21}] {:>3}%: fsck on {}{}", + std::string(it.fsckPercentComplete * 2, '=') + ">", + it.fsckPercentComplete * 10, + it.localDir, + "\n"); printedInProgress++; } totalLinesPrinted++; diff --git a/eden/fs/service/EdenServiceHandler.cpp b/eden/fs/service/EdenServiceHandler.cpp index 7f402101d3..d27a2b87dd 100644 --- a/eden/fs/service/EdenServiceHandler.cpp +++ b/eden/fs/service/EdenServiceHandler.cpp @@ -218,7 +218,7 @@ class ThriftLogHelper { ~ThriftLogHelper() { // Logging completion time for the request // The line number points to where the object was originally created - TLOG(itcLogger_, level_, itcFileName_, itcLineNumber_) << folly::format( + TLOG(itcLogger_, level_, itcFileName_, itcLineNumber_) << folly::sformat( "{}() took {:,} " EDEN_MICRO, itcFunctionName_, itcTimer_.elapsed().count());