Resolving merge conflict in tests/test_pytypes.cpp when rebasing after the just-merged PR #3080. Also rerunning clang-format-diff.py to pick up a few fixes missed before.

Author: rwgk

include/pybind11/detail/common.h

@@ -272,14 +272,15 @@ extern "C" {
         }                                                                      \
     }
 
-#define PYBIND11_CATCH_INIT_EXCEPTIONS \
-        catch (pybind11::error_already_set &e) {                               \
-            PyErr_SetString(PyExc_ImportError, e.what());                      \
-            return nullptr;                                                    \
-        } catch (const std::exception &e) {                                    \
-            PyErr_SetString(PyExc_ImportError, e.what());                      \
-            return nullptr;                                                    \
-        }                                                                      \
+#define PYBIND11_CATCH_INIT_EXCEPTIONS                                                            \
+    catch (pybind11::error_already_set & e) {                                                     \
+        PyErr_SetString(PyExc_ImportError, e.what());                                             \
+        return nullptr;                                                                           \
+    }                                                                                             \
+    catch (const std::exception &e) {                                                             \
+        PyErr_SetString(PyExc_ImportError, e.what());                                             \
+        return nullptr;                                                                           \
+    }
 
 // clang-format off
 /** \rst

include/pybind11/iostream.h

@@ -134,7 +134,6 @@ class pythonbuf : public std::streambuf {
 
 PYBIND11_NAMESPACE_END(detail)
 
-
 // clang-format off
 /** \rst
     This a move-only guard that redirects output.
@@ -184,7 +183,6 @@ class scoped_ostream_redirect {
     scoped_ostream_redirect &operator=(scoped_ostream_redirect &&) = delete;
 };
 
-
 // clang-format off
 /** \rst
     Like `scoped_ostream_redirect`, but redirects cerr by default. This class

tests/pybind11_tests.h

@@ -8,7 +8,8 @@
 
 #if defined(_MSC_VER) && _MSC_VER < 1910
 // We get some really long type names here which causes MSVC 2015 to emit warnings
-#  pragma warning(disable: 4503) // warning C4503: decorated name length exceeded, name was truncated
+#    pragma warning(                                                                              \
+        disable : 4503) // warning C4503: decorated name length exceeded, name was truncated
 #endif
 
 namespace py = pybind11;

tests/test_pytypes.cpp

@@ -259,22 +259,22 @@ TEST_SUBMODULE(pytypes, m) {
     m.def("convert_to_pybind11_str", [](py::object o) { return py::str(o); });
 
     m.def("nonconverting_constructor",
-        // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        [](std::string type, py::object value, bool move) -> py::object {
-        if (type == "bytes") {
-            return move ? py::bytes(std::move(value)) : py::bytes(value);
-        }
-        if (type == "none") {
-            return move ? py::none(std::move(value)) : py::none(value);
-        }
-        if (type == "ellipsis") {
-            return move ? py::ellipsis(std::move(value)) : py::ellipsis(value);
-        }
-        if (type == "type") {
-            return move ? py::type(std::move(value)) : py::type(value);
-        }
-        throw std::runtime_error("Invalid type");
-    });
+          // NOLINTNEXTLINE(performance-unnecessary-value-param)
+          [](std::string type, py::object value, bool move) -> py::object {
+              if (type == "bytes") {
+                  return move ? py::bytes(std::move(value)) : py::bytes(value);
+              }
+              if (type == "none") {
+                  return move ? py::none(std::move(value)) : py::none(value);
+              }
+              if (type == "ellipsis") {
+                  return move ? py::ellipsis(std::move(value)) : py::ellipsis(value);
+              }
+              if (type == "type") {
+                  return move ? py::type(std::move(value)) : py::type(value);
+              }
+              throw std::runtime_error("Invalid type");
+          });
 
     m.def("get_implicit_casting", []() {
         py::dict d;