From 2fcf8490a3a7a2e1d434f33383b5d33a0bc3ac03 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <steinar+git@gunderson.no>
Date: Fri, 9 Oct 2020 10:06:00 +0200
Subject: [PATCH] clang-format again (IWYU and clang-format seemingly
 disagree).

---
 io_uring_engine.cpp |  8 ++++----
 io_uring_engine.h   |  6 +++---
 plocate-build.cpp   | 24 ++++++++++++------------
 plocate.cpp         | 31 +++++++++++++++----------------
 turbopfor.cpp       |  2 +-
 5 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/io_uring_engine.cpp b/io_uring_engine.cpp
index 433fef5..fc51aba 100644
--- a/io_uring_engine.cpp
+++ b/io_uring_engine.cpp
@@ -1,18 +1,18 @@
-#include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifndef WITHOUT_URING
 #include <liburing.h>
 #endif
-#include <unistd.h>
+#include "io_uring_engine.h"
+
 #include <functional>
 #include <iosfwd>
 #include <string>
+#include <unistd.h>
 #include <utility>
 
-#include "io_uring_engine.h"
-
 using namespace std;
 
 IOUringEngine::IOUringEngine(size_t slop_bytes)
diff --git a/io_uring_engine.h b/io_uring_engine.h
index f1238ad..c165a40 100644
--- a/io_uring_engine.h
+++ b/io_uring_engine.h
@@ -1,12 +1,12 @@
 #ifndef IO_URING_ENGINE_H
 #define IO_URING_ENGINE_H 1
 
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <functional>
 #include <queue>
+#include <stddef.h>
 #include <string_view>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 struct io_uring_sqe;
 #ifndef WITHOUT_URING
diff --git a/plocate-build.cpp b/plocate-build.cpp
index a2cd4b8..023aedb 100644
--- a/plocate-build.cpp
+++ b/plocate-build.cpp
@@ -1,22 +1,22 @@
+#include "db.h"
+#include "turbopfor-encode.h"
+
+#include <algorithm>
 #include <assert.h>
+#include <chrono>
+#include <iosfwd>
 #include <math.h>
-#include <stdio.h>
+#include <memory>
 #include <stdint.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <zstd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <algorithm>
-#include <chrono>
-#include <memory>
+#include <string.h>
 #include <string>
-#include <vector>
-#include <iosfwd>
 #include <string_view>
+#include <sys/stat.h>
 #include <utility>
-
-#include "db.h"
-#include "turbopfor-encode.h"
+#include <vector>
+#include <zstd.h>
 
 #define P4NENC_BOUND(n) ((n + 127) / 128 + (n + 32) * sizeof(uint32_t))
 #define dprintf(...)
diff --git a/plocate.cpp b/plocate.cpp
index 1654e7c..e219db0 100644
--- a/plocate.cpp
+++ b/plocate.cpp
@@ -1,28 +1,27 @@
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <zstd.h>
-#include <getopt.h>
-#include <stdlib.h>
+#include "db.h"
+#include "io_uring_engine.h"
+
 #include <algorithm>
 #include <chrono>
+#include <fcntl.h>
 #include <functional>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <stdint.h>
+#include <getopt.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
+#include <memory>
 #include <queue>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
 #include <string_view>
+#include <unistd.h>
+#include <unordered_map>
 #include <utility>
-
-#include "db.h"
-#include "io_uring_engine.h"
+#include <vector>
+#include <zstd.h>
 
 using namespace std;
 using namespace std::chrono;
diff --git a/turbopfor.cpp b/turbopfor.cpp
index 8deebd9..8a91c33 100644
--- a/turbopfor.cpp
+++ b/turbopfor.cpp
@@ -1,9 +1,9 @@
+#include <algorithm>
 #include <assert.h>
 #include <endian.h>
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <algorithm>
 
 #if defined(__i386__) || defined(__x86_64__)
 #define COULD_HAVE_SSE2
-- 
2.39.2