Fix CI, again (#4083)

nlohmann · Sep 7, 2023 · 836b7be · 836b7be
1 parent 788e546
commit 836b7be
Show file tree

Hide file tree

Showing 39 changed files with 45 additions and 172 deletions.
diff --git a/Makefile b/Makefile
@@ -156,7 +156,8 @@ pretty:
 	    --pad-header \
 	    --align-pointer=type \
 	    --align-reference=type \
-	    --add-brackets \
+	    --add-braces \
+	    --squeeze-lines=2 \
 	    --convert-tabs \
 	    --close-templates \
 	    --lineend=linux \

diff --git a/docs/examples/at__json_pointer.cpp b/docs/examples/at__json_pointer.cpp
@@ -35,7 +35,6 @@ int main()
     // output the changed array
     std::cout << j["array"] << '\n';
 
-
     // out_of_range.106
     try
     {

diff --git a/docs/examples/at__keytype.c++17.cpp b/docs/examples/at__keytype.c++17.cpp
@@ -24,7 +24,6 @@ int main()
     // output changed array
     std::cout << object << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/at__keytype_const.c++17.cpp b/docs/examples/at__keytype_const.c++17.cpp
@@ -18,7 +18,6 @@ int main()
     // output element with key "the ugly" using string_view
     std::cout << object.at("the ugly"sv) << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/at__object_t_key_type.cpp b/docs/examples/at__object_t_key_type.cpp
@@ -22,7 +22,6 @@ int main()
     // output changed array
     std::cout << object << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/at__object_t_key_type_const.cpp b/docs/examples/at__object_t_key_type_const.cpp
@@ -16,7 +16,6 @@ int main()
     // output element with key "the ugly"
     std::cout << object.at("the ugly") << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/at__size_type.cpp b/docs/examples/at__size_type.cpp
@@ -17,7 +17,6 @@ int main()
     // output changed array
     std::cout << array << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/at__size_type_const.cpp b/docs/examples/at__size_type_const.cpp
@@ -11,7 +11,6 @@ int main()
     // output element at index 2 (third element)
     std::cout << array.at(2) << '\n';
 
-
     // exception type_error.304
     try
     {

diff --git a/docs/examples/basic_json__CompatibleType.cpp b/docs/examples/basic_json__CompatibleType.cpp
@@ -55,7 +55,6 @@ int main()
     std::cout << j_mmap << '\n';
     std::cout << j_ummap << "\n\n";
 
-
     // ===========
     // array types
     // ===========
@@ -117,7 +116,6 @@ int main()
     std::cout << j_mset << '\n';
     std::cout << j_umset << "\n\n";
 
-
     // ============
     // string types
     // ============
@@ -138,7 +136,6 @@ int main()
     std::cout << j_string_literal << '\n';
     std::cout << j_stdstring << "\n\n";
 
-
     // ============
     // number types
     // ============
@@ -203,7 +200,6 @@ int main()
     std::cout << j_float_nan << '\n';
     std::cout << j_double << "\n\n";
 
-
     // =============
     // boolean types
     // =============

diff --git a/docs/examples/get_to.cpp b/docs/examples/get_to.cpp
@@ -30,7 +30,6 @@ int main()
     std::vector<short> v7;
     std::unordered_map<std::string, json> v8;
 
-
     // use explicit conversions
     json_types["boolean"].get_to(v1);
     json_types["number"]["integer"].get_to(v2);

diff --git a/docs/examples/operator_spaceship__const_reference.c++20.cpp b/docs/examples/operator_spaceship__const_reference.c++20.cpp
@@ -32,7 +32,6 @@ int main()
     json string = "foo";
     json discarded = json(json::value_t::discarded);
 
-
     // output values and comparisons
     std::cout << array_1 << " <=> " << array_2 << " := " << to_string(array_1 <=> array_2) << '\n'; // *NOPAD*
     std::cout << object_1 << " <=> " << object_2 << " := " << to_string(object_1 <=> object_2) << '\n'; // *NOPAD*

diff --git a/docs/examples/operator_spaceship__scalartype.c++20.cpp b/docs/examples/operator_spaceship__scalartype.c++20.cpp
@@ -31,7 +31,6 @@ int main()
     json number = 17;
     json string = "17";
 
-
     // output values and comparisons
     std::cout << std::boolalpha << std::fixed;
     std::cout << boolean << " <=> " << true << " := " << to_string(boolean <=> true) << '\n'; // *NOPAD*

diff --git a/docs/examples/parse__istream__parser_callback_t.cpp b/docs/examples/parse__istream__parser_callback_t.cpp
@@ -33,7 +33,6 @@ int main()
     json j_complete = json::parse(ss);
     std::cout << std::setw(4) << j_complete << "\n\n";
 
-
     // define parser callback
     json::parser_callback_t cb = [](int depth, json::parse_event_t event, json & parsed)
     {

diff --git a/docs/examples/parse__string__parser_callback_t.cpp b/docs/examples/parse__string__parser_callback_t.cpp
@@ -28,7 +28,6 @@ int main()
     json j_complete = json::parse(text);
     std::cout << std::setw(4) << j_complete << "\n\n";
 
-
     // define parser callback
     json::parser_callback_t cb = [](int depth, json::parse_event_t event, json & parsed)
     {

diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp
@@ -25,7 +25,6 @@
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/string_concat.hpp>
 
-
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {

diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp
@@ -55,7 +55,6 @@ static inline bool little_endianness(int num = 1) noexcept
     return *reinterpret_cast<char*>(&num) == 1;
 }
 
-
 ///////////////////
 // binary reader //
 ///////////////////

diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp
@@ -71,7 +71,6 @@ class file_input_adapter
     std::FILE* m_file;
 };
 
-
 /*!
 Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
 beginning of input. Does not support changing the underlying std::streambuf
@@ -170,7 +169,6 @@ class iterator_input_adapter
     }
 };
 
-
 template<typename BaseInputAdapter, size_t T>
 struct wide_string_input_helper;
 
@@ -339,7 +337,6 @@ class wide_string_input_adapter
     std::size_t utf8_bytes_filled = 0;
 };
 
-
 template<typename IteratorType, typename Enable = void>
 struct iterator_input_adapter_factory
 {

diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp
@@ -142,7 +142,6 @@ struct json_sax
     virtual ~json_sax() = default;
 };
 
-
 namespace detail
 {
 /*!
@@ -591,7 +590,7 @@ class json_sax_dom_callback_parser
         if (ref_stack.empty())
         {
             root = std::move(value);
-            return {true, &root};
+            return {true, & root};
         }
 
         // skip this value if we already decided to skip the parent
@@ -608,7 +607,7 @@ class json_sax_dom_callback_parser
         if (ref_stack.back()->is_array())
         {
             ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_data.m_value.array->back())};
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
         }
 
         // object

diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp
@@ -69,10 +69,10 @@ template<typename IteratorType> class iteration_proxy_value
     // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
     iteration_proxy_value(iteration_proxy_value&&)
     noexcept(std::is_nothrow_move_constructible<IteratorType>::value
-             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
     iteration_proxy_value& operator=(iteration_proxy_value&&)
     noexcept(std::is_nothrow_move_assignable<IteratorType>::value
-             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
     ~iteration_proxy_value() = default;
 
     /// dereference operator (needed for range-based for)

diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp
@@ -411,7 +411,6 @@
     inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
     inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
 
-
 // inspired from https://stackoverflow.com/a/26745591
 // allows to call any std function as if (e.g. with begin):
 // using std::begin; begin(x);

diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
@@ -217,7 +217,6 @@ template <typename... Ts>
 struct is_default_constructible<const std::tuple<Ts...>>
             : conjunction<is_default_constructible<Ts>...> {};
 
-
 template <typename T, typename... Args>
 struct is_constructible : std::is_constructible<T, Args...> {};
 
@@ -233,7 +232,6 @@ struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple
 template <typename... Ts>
 struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
 
-
 template<typename T, typename = void>
 struct is_iterator_traits : std::false_type {};
 
@@ -643,7 +641,6 @@ struct value_in_range_of_impl2<OfType, T, false, true>
     }
 };
 
-
 template<typename OfType, typename T>
 struct value_in_range_of_impl2<OfType, T, true, true>
 {