Apply clang format and other minor formatting tweaks

CMakeLists.txt

@@ -275,7 +275,7 @@ if (FMT_TEST)
   add_subdirectory(test)
 endif ()
 
-# control fuzzing independent of the unit tests
+# Control fuzzing independent of the unit tests.
 if (FMT_FUZZ)
   add_subdirectory(test/fuzzing)
 endif ()

support/travis-build.py

@@ -90,7 +90,7 @@ cmake_flags = [
     '-DCMAKE_CXX_STANDARD=' + standard
 ]
 
-# make sure the fuzzers still compile
+# Make sure the fuzzers still compile.
 if 'ENABLE_FUZZING' in os.environ:
     cmake_flags += ['-DFMT_FUZZ=ON', '-DFMT_FUZZ_LINKMAIN=On']
 

test/fuzzing/CMakeLists.txt

@@ -6,11 +6,11 @@
 # (note that libFuzzer can also reproduce, just pass it the files)
 option(FMT_FUZZ_LINKMAIN "enables the reproduce mode, instead of libFuzzer" On)
 
-#for oss-fuzz - insert $LIB_FUZZING_ENGINE into the link flags, but only for
+# For oss-fuzz - insert $LIB_FUZZING_ENGINE into the link flags, but only for
 # the fuzz targets, otherwise the cmake configuration step fails.
 set(FMT_FUZZ_LDFLAGS "" CACHE STRING "LDFLAGS for the fuzz targets")
 
-#find all fuzzers.
+# Find all fuzzers.
 set(SOURCES
   chrono_duration.cpp
   named_arg.cpp

test/fuzzing/README.md

@@ -1,7 +1,11 @@
 # FMT Fuzzer
-Fuzzing has revealed [several bugs](https://github.com/fmtlib/fmt/issues?&q=is%3Aissue+fuzz) in fmt. It is a part of the continous fuzzing at [oss-fuzz](https://github.com/google/oss-fuzz)
 
-The source code is modified to make the fuzzing possible without locking up on resource exhaustion:
+Fuzzing has revealed [several bugs](https://github.com/fmtlib/fmt/issues?&q=is%3Aissue+fuzz)
+in fmt. It is a part of the continous fuzzing at
+[oss-fuzz](https://github.com/google/oss-fuzz).
+
+The source code is modified to make the fuzzing possible without locking up on
+resource exhaustion:
 ```cpp
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 if(spec.precision>100000) {
@@ -9,10 +13,15 @@ if(spec.precision>100000) {
 }
 #endif
 ```
-This macro is the defacto standard for making fuzzing practically possible, see [the libFuzzer documentation](https://llvm.org/docs/LibFuzzer.html#fuzzer-friendly-build-mode).
+This macro is the defacto standard for making fuzzing practically possible, see
+[the libFuzzer documentation](https://llvm.org/docs/LibFuzzer.html#fuzzer-friendly-build-mode).
 
 ## Running the fuzzers locally
-There is a [helper script](build.sh) to build the fuzzers, which has only been tested on Debian and Ubuntu linux so far. There should be no problems fuzzing on Windows (using clang>=8) or on Mac, but the script will probably not work out of the box.
+
+There is a [helper script](build.sh) to build the fuzzers, which has only been
+tested on Debian and Ubuntu linux so far. There should be no problems fuzzing on
+Windows (using clang>=8) or on Mac, but the script will probably not work out of
+the box.
 
 Something along
 ```sh

test/fuzzing/fuzzer_common.h

@@ -4,9 +4,9 @@
 // Copyright (c) 2019, Paul Dreik
 // License: see LICENSE.rst in the fmt root directory
 
+#include <cstdint>      // std::uint8_t
 #include <cstring>      // memcpy
 #include <type_traits>  // trivially copyable
-#include <cstdint>     // std::uint8_t
 
 // one can format to either a string, or a buf. buf is faster,
 // but one may be interested in formatting to a string instead to
@@ -25,8 +25,8 @@
 // is likely interesting.
 // For this, we must know the size of the largest possible type in use.
 
-// There are some problems on travis, claiming Nfixed is not a constant expression
+// There are some problems on travis, claiming Nfixed is not a constant
-// which seems to be an issue with older versions of libstdc++
+// expression which seems to be an issue with older versions of libstdc++
 #if _GLIBCXX_RELEASE >= 7
 #  include <algorithm>
 namespace fmt_fuzzer {
@@ -40,21 +40,18 @@ namespace fmt_fuzzer {
 
 namespace fmt_fuzzer {
 // view data as a c char pointer.
-template <typename T>
+template <typename T> inline const char* as_chars(const T* data) {
-inline const char* as_chars(const T* data) {
   return static_cast<const char*>(static_cast<const void*>(data));
 }
 
 // view data as a byte pointer
-template <typename T>
+template <typename T> inline const std::uint8_t* as_bytes(const T* data) {
-inline const std::uint8_t* as_bytes(const T* data) {
   return static_cast<const std::uint8_t*>(static_cast<const void*>(data));
 }
 
 // blits bytes from Data to form an (assumed trivially constructible) object
 // of type Item
-template <class Item>
+template <class Item> inline Item assignFromBuf(const std::uint8_t* Data) {
-inline Item assignFromBuf(const std::uint8_t* Data) {
   Item item{};
   std::memcpy(&item, Data, sizeof(Item));
   return item;
@@ -67,5 +64,4 @@ template <> inline bool assignFromBuf<bool>(const std::uint8_t* Data) {
 
 }  // namespace fmt_fuzzer
 
-
 #endif  // FUZZER_COMMON_H

test/fuzzing/named_arg.cpp

@@ -126,4 +126,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
   }
   return 0;
 }
-