Revert "CXX-2258 Change prelude order and rerun clang-format (#797)"

This reverts commit 8a9ce93.

Author: kevinAlbs

.clang-format

@@ -1,20 +1,12 @@
+BasedOnStyle: Google
 AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-BasedOnStyle: Google
 BinPackArguments: false
 BinPackParameters: false
 ColumnLimit: 100
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex:    'prelude\.(hpp|hh)' # preludes
-    Priority: 3
-  - Regex:    '<[[:alnum:]_.]+>' # system headers
-    Priority: 1
-  - Regex:    '.*' # driver headers
-    Priority: 2
 IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None

src/bsoncxx/array/element.cpp

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/array/element.hpp>
+
 #include <cstdlib>
 #include <cstring>
 #include <stdexcept>
 
-#include <bsoncxx/array/element.hpp>
-
 #include <bsoncxx/config/private/prelude.hh>
 
 namespace bsoncxx {
@@ -32,6 +32,6 @@ element::element(const std::uint8_t* raw,
                  std::uint32_t keylen)
     : document::element(raw, length, offset, keylen) {}
 
-}  // namespace array
+}  // namespace document
 BSONCXX_INLINE_NAMESPACE_END
 }  // namespace bsoncxx

src/bsoncxx/array/element.hpp

@@ -41,37 +41,37 @@ class BSONCXX_API element : private document::element {
 
     using document::element::type;
 
+    using document::element::get_double;
+    using document::element::get_utf8;
+    using document::element::get_document;
     using document::element::get_array;
     using document::element::get_binary;
+    using document::element::get_undefined;
+    using document::element::get_oid;
     using document::element::get_bool;
-    using document::element::get_code;
-    using document::element::get_codewscope;
     using document::element::get_date;
-    using document::element::get_dbpointer;
-    using document::element::get_decimal128;
-    using document::element::get_document;
-    using document::element::get_double;
-    using document::element::get_int32;
-    using document::element::get_int64;
-    using document::element::get_maxkey;
-    using document::element::get_minkey;
     using document::element::get_null;
-    using document::element::get_oid;
     using document::element::get_regex;
+    using document::element::get_dbpointer;
+    using document::element::get_code;
     using document::element::get_symbol;
+    using document::element::get_codewscope;
+    using document::element::get_int32;
     using document::element::get_timestamp;
-    using document::element::get_undefined;
-    using document::element::get_utf8;
+    using document::element::get_int64;
+    using document::element::get_decimal128;
+    using document::element::get_minkey;
+    using document::element::get_maxkey;
 
     using document::element::get_value;
 
     using document::element::operator[];
 
-    using document::element::key;
-    using document::element::keylen;
+    using document::element::raw;
     using document::element::length;
     using document::element::offset;
-    using document::element::raw;
+    using document::element::keylen;
+    using document::element::key;
 
    private:
     friend class view;

src/bsoncxx/array/value.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/array/value.hpp>
+
 #include <cstdlib>
 #include <cstring>
 
-#include <bsoncxx/array/value.hpp>
-
 #include <bsoncxx/config/private/prelude.hh>
 
 namespace bsoncxx {

src/bsoncxx/array/view.cpp

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/array/view.hpp>
+
 #include <cstdlib>
 #include <cstring>
 #include <tuple>
 
-#include <bsoncxx/array/view.hpp>
 #include <bsoncxx/private/itoa.hh>
 #include <bsoncxx/private/libbson.hh>
 #include <bsoncxx/types.hpp>

src/bsoncxx/builder/basic/array.hpp

@@ -42,7 +42,7 @@ class array : public sub_array {
     ///
     /// Move constructor
     ///
-    BSONCXX_INLINE array(array&& arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
+    BSONCXX_INLINE array(array &&arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
 
     ///
     /// Move assignment operator

src/bsoncxx/builder/basic/document.hpp

@@ -44,8 +44,8 @@ class document : public sub_document {
     ///
     /// Move constructor
     ///
-    BSONCXX_INLINE document(document&& doc) noexcept
-        : sub_document(&_core), _core(std::move(doc._core)) {}
+    BSONCXX_INLINE document(document &&doc) noexcept : sub_document(&_core),
+                                                       _core(std::move(doc._core)) {}
 
     ///
     /// Move assignment operator

src/bsoncxx/builder/core.cpp

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/builder/core.hpp>
+
 #include <cstring>
 
-#include <bsoncxx/builder/core.hpp>
 #include <bsoncxx/exception/error_code.hpp>
 #include <bsoncxx/exception/exception.hpp>
 #include <bsoncxx/private/itoa.hh>

src/bsoncxx/decimal128.cpp

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <bsoncxx/decimal128.hpp>
+
 #include <bsoncxx/exception/error_code.hpp>
 #include <bsoncxx/exception/exception.hpp>
 #include <bsoncxx/private/libbson.hh>

src/bsoncxx/document/element.cpp

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/document/element.hpp>
+
 #include <cstdlib>
 #include <cstring>
 
-#include <bsoncxx/document/element.hpp>
 #include <bsoncxx/exception/error_code.hpp>
 #include <bsoncxx/exception/exception.hpp>
 #include <bsoncxx/json.hpp>