update clang-format (mongodb#754)

Author: bazile-clyde

.clang-format

@@ -1,12 +1,20 @@
-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: 1
+  - Regex:    '<[[:alnum:]_.]+>' # system headers
+    Priority: 2
+  - Regex:    '.*' # driver headers
+    Priority: 3
 IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None

etc/clang_format.py

@@ -40,17 +40,17 @@
 #
 
 # Expected version of clang-format
-CLANG_FORMAT_VERSION = "3.8.0"
-CLANG_FORMAT_SHORT_VERSION = "3.8"
+CLANG_FORMAT_VERSION = "7.0.1"
+CLANG_FORMAT_SHORT_VERSION = "7.0"
 
 # Name of clang-format as a binary
 CLANG_FORMAT_PROGNAME = "clang-format"
 
 # URL location of the "cached" copy of clang-format to download
 # for users which do not have clang-format installed
-CLANG_FORMAT_HTTP_LINUX_CACHE = "https://s3.amazonaws.com/boxes.10gen.com/build/clang-format-3.8-rhel55.tar.gz"
+CLANG_FORMAT_HTTP_LINUX_CACHE = "https://s3.amazonaws.com/boxes.10gen.com/build/clang-format-7.0.1-rhel70.tar.gz"
 
-CLANG_FORMAT_HTTP_DARWIN_CACHE = "https://s3.amazonaws.com/boxes.10gen.com/build/clang%2Bllvm-3.8.0-x86_64-apple-darwin.tar.xz"
+CLANG_FORMAT_HTTP_DARWIN_CACHE = "https://s3.amazonaws.com/boxes.10gen.com/build/clang-format-7.0.1-x86_64-apple-darwin.tar.gz"
 
 # Path in the tarball to the clang-format binary
 CLANG_FORMAT_SOURCE_TAR_BASE = string.Template("clang+llvm-$version-$tar_path/bin/" + CLANG_FORMAT_PROGNAME)

examples/add_subdirectory/hello_mongocxx.cpp

@@ -17,7 +17,6 @@
 
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/json.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>

examples/bsoncxx/builder_basic.cpp

@@ -55,8 +55,8 @@ int main(int, char**) {
     // as a parameter, which appends the keys in-place.
     // After the lambda returns, the builder will end the subdocument.
 
-    using bsoncxx::builder::basic::sub_document;
     using bsoncxx::builder::basic::sub_array;
+    using bsoncxx::builder::basic::sub_document;
 
     doc.append(kvp("subdocument key",
                    [](sub_document subdoc) {
@@ -65,14 +65,10 @@ int main(int, char**) {
                    }),
                kvp("subarray key", [](sub_array subarr) {
                    // subarrays work similarly
-                   subarr.append(1,
-                                 types::b_bool{false},
-                                 "hello",
-                                 5,
-                                 [](sub_document subdoc) {
-                                     // nesting works too!
-                                     subdoc.append(kvp("such", "nesting"), kvp("much", "recurse"));
-                                 });
+                   subarr.append(1, types::b_bool{false}, "hello", 5, [](sub_document subdoc) {
+                       // nesting works too!
+                       subdoc.append(kvp("such", "nesting"), kvp("much", "recurse"));
+                   });
                }));
 
     // We can get a view of the resulting bson by calling view()

examples/bsoncxx/builder_list.cpp

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <chrono>
+
 #include <bsoncxx/builder/list.hpp>
 #include <bsoncxx/types.hpp>
 #include <bsoncxx/types/bson_value/value.hpp>
-#include <chrono>
 
 using namespace bsoncxx;
 

examples/bsoncxx/builder_stream.cpp

@@ -20,8 +20,8 @@
 using namespace bsoncxx;
 
 int main(int, char**) {
-    using builder::stream::document;
     using builder::stream::array;
+    using builder::stream::document;
 
     // bsoncxx::builder::stream presents an iostream like interface for succinctly
     // constructing complex BSON objects.
@@ -44,13 +44,13 @@ int main(int, char**) {
     // The stream namespace includes some helpers that can be used similarly
     // to the stream manipulators in <iomanip>
     // To build a subdocument, use open_document and close_document
-    using builder::stream::open_document;
     using builder::stream::close_document;
+    using builder::stream::open_document;
     doc << "mySubDoc" << open_document << "subdoc key"
         << "subdoc value" << close_document;
     // To build a subarray, use open_array and close_array
-    using builder::stream::open_array;
     using builder::stream::close_array;
+    using builder::stream::open_array;
     doc << "mySubArr" << open_array << 1 << types::b_bool{false} << "hello" << close_array;
 
     // There is a special finalize helper that converts a stream to its underlying bson value

examples/bsoncxx/getting_values.cpp

@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <bsoncxx/config/prelude.hpp>
+
 #include <cstdlib>
 
 #include <bsoncxx/builder/stream/array.hpp>
 #include <bsoncxx/builder/stream/document.hpp>
 #include <bsoncxx/builder/stream/helpers.hpp>
-#include <bsoncxx/config/prelude.hpp>
 #include <bsoncxx/types.hpp>
 
 using namespace bsoncxx;

examples/bsoncxx/view_and_value.cpp

@@ -17,7 +17,6 @@
 #include <iterator>
 #include <vector>
 
-#include <bsoncxx/array/view.hpp>
 #include <bsoncxx/array/view.hpp>
 #include <bsoncxx/builder/basic/array.hpp>
 #include <bsoncxx/builder/basic/document.hpp>

examples/mongocxx/automatic_client_side_field_level_encryption.cpp

@@ -31,15 +31,15 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
-using bsoncxx::builder::basic::make_document;
 using bsoncxx::builder::basic::kvp;
+using bsoncxx::builder::basic::make_document;
 
-using bsoncxx::builder::stream::document;
-using bsoncxx::builder::stream::open_array;
 using bsoncxx::builder::stream::close_array;
-using bsoncxx::builder::stream::open_document;
 using bsoncxx::builder::stream::close_document;
+using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
+using bsoncxx::builder::stream::open_array;
+using bsoncxx::builder::stream::open_document;
 
 using bsoncxx::types::bson_value::make_value;
 

examples/mongocxx/causal_consistency.cpp

@@ -29,10 +29,10 @@
 #include <mongocxx/uri.hpp>
 #include <mongocxx/write_concern.hpp>
 
-using bsoncxx::builder::stream::document;
-using bsoncxx::builder::stream::open_document;
 using bsoncxx::builder::stream::close_document;
+using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
+using bsoncxx::builder::stream::open_document;
 
 int main() {
     using namespace mongocxx;

examples/mongocxx/client_session.cpp

@@ -21,9 +21,9 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+using bsoncxx::to_json;
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
-using bsoncxx::to_json;
 using namespace mongocxx;
 
 int main() {

examples/mongocxx/connect.cpp

@@ -20,7 +20,6 @@
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/json.hpp>
 #include <bsoncxx/stdx/make_unique.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/logger.hpp>

examples/mongocxx/create.cpp

@@ -18,7 +18,6 @@
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/types.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>

examples/mongocxx/document_validation.cpp

@@ -17,7 +17,6 @@
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/stdx/string_view.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/exception/exception.hpp>
 #include <mongocxx/instance.hpp>

examples/mongocxx/exception.cpp

@@ -27,8 +27,8 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
-using bsoncxx::builder::basic::make_document;
 using bsoncxx::builder::basic::kvp;
+using bsoncxx::builder::basic::make_document;
 
 int main(int, char**) {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,

examples/mongocxx/explicit_encryption.cpp

@@ -30,13 +30,13 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
-using bsoncxx::builder::basic::make_document;
 using bsoncxx::builder::basic::kvp;
+using bsoncxx::builder::basic::make_document;
 
-using bsoncxx::builder::stream::document;
-using bsoncxx::builder::stream::open_document;
 using bsoncxx::builder::stream::close_document;
+using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
+using bsoncxx::builder::stream::open_document;
 
 using bsoncxx::types::bson_value::make_value;
 

examples/mongocxx/explicit_encryption_auto_decryption.cpp

@@ -30,13 +30,13 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
-using bsoncxx::builder::basic::make_document;
 using bsoncxx::builder::basic::kvp;
+using bsoncxx::builder::basic::make_document;
 
-using bsoncxx::builder::stream::document;
-using bsoncxx::builder::stream::open_document;
 using bsoncxx::builder::stream::close_document;
+using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
+using bsoncxx::builder::stream::open_document;
 
 using bsoncxx::types::bson_value::make_value;
 

examples/mongocxx/get_values_from_documents.cpp

@@ -20,10 +20,10 @@
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 
+using bsoncxx::type;
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_array;
 using bsoncxx::builder::basic::make_document;
-using bsoncxx::type;
 
 // Document model, showing array with nested documents:
 //

examples/mongocxx/instance_management.cpp

@@ -18,7 +18,6 @@
 #include <bsoncxx/stdx/make_unique.hpp>
 #include <bsoncxx/stdx/optional.hpp>
 #include <bsoncxx/stdx/string_view.hpp>
-
 #include <mongocxx/instance.hpp>
 #include <mongocxx/logger.hpp>
 #include <mongocxx/pool.hpp>

examples/mongocxx/query.cpp

@@ -18,7 +18,6 @@
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/json.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/options/find.hpp>

examples/mongocxx/query_projection.cpp

@@ -17,7 +17,6 @@
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/json.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/options/find.hpp>

examples/mongocxx/remove.cpp

@@ -14,7 +14,6 @@
 
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>

examples/mongocxx/server_side_field_level_encryption_enforcement.cpp

@@ -30,15 +30,15 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
-using bsoncxx::builder::basic::make_document;
 using bsoncxx::builder::basic::kvp;
+using bsoncxx::builder::basic::make_document;
 
-using bsoncxx::builder::stream::document;
-using bsoncxx::builder::stream::open_array;
 using bsoncxx::builder::stream::close_array;
-using bsoncxx::builder::stream::open_document;
 using bsoncxx::builder::stream::close_document;
+using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
+using bsoncxx::builder::stream::open_array;
+using bsoncxx::builder::stream::open_document;
 
 using bsoncxx::types::bson_value::make_value;
 

examples/mongocxx/tailable_cursor.cpp

@@ -18,7 +18,6 @@
 
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/json.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/collection.hpp>
 #include <mongocxx/database.hpp>

examples/mongocxx/view_or_value_variant.cpp

@@ -15,16 +15,15 @@
 #include <bsoncxx/builder/basic/array.hpp>
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/builder/basic/kvp.hpp>
-
 #include <bsoncxx/stdx/make_unique.hpp>
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/stdx.hpp>
 #include <mongocxx/uri.hpp>
 
+using bsoncxx::builder::basic::array;
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
-using bsoncxx::builder::basic::array;
 
 int main(int, char**) {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,

examples/projects/bsoncxx/hello_bsoncxx.cpp

@@ -17,7 +17,7 @@
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/json.hpp>
 
-int main(int, char* []) {
+int main(int, char*[]) {
     using bsoncxx::builder::basic::kvp;
     using bsoncxx::builder::basic::make_document;
 

examples/projects/mongocxx/hello_mongocxx.cpp

@@ -17,7 +17,6 @@
 
 #include <bsoncxx/builder/basic/document.hpp>
 #include <bsoncxx/json.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>

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 <bsoncxx/types/bson_value/view.hpp>
+#include <bsoncxx/config/private/prelude.hh>
 
 #include <stdexcept>
 
-#include <bsoncxx/config/private/prelude.hh>
+#include <bsoncxx/array/element.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
 
 namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
@@ -47,6 +47,6 @@ bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& el
     return !(elem == v);
 }
 
-}  // namespace document
+}  // namespace array
 BSONCXX_INLINE_NAMESPACE_END
 }  // namespace bsoncxx