build: bump py-build-cmake

nickelpro · Jan 1, 2025 · f5ebc67 · f5ebc67
1 parent 443f905
commit f5ebc67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 add_subdirectory(src)
 
 if(DEFINED PY_BUILD_CMAKE_VERSION)
-  set(NANOROUTE_PLATLIB ${PY_BUILD_CMAKE_PACKAGE_NAME}-${PY_BUILD_CMAKE_PACKAGE_VERSION}.data/platlib)
+  set(NANOROUTE_PLATLIB ${PY_BUILD_CMAKE_PROJECT_NAME}-${PY_BUILD_CMAKE_PROJECT_VERSION}.data/platlib)
 else()
   set(NANOROUTE_PLATLIB platlib)
 endif()

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ urls = { "Documentation" = "https://nanoroute.dev" }
 dependencies = []
 
 [build-system]
-requires = ["py-build-cmake~=0.3.3"]
+requires = ["py-build-cmake~=0.3.4"]
 build-backend = "py_build_cmake.build"
 
 [tool.py-build-cmake.module]

diff --git a/src/PyRouter.cpp b/src/PyRouter.cpp
@@ -447,15 +447,14 @@ int PyRouter::init(PyRouter* self, PyObject* /*args*/, PyObject* /*kwargs*/) {
 int PyRouter::traverse(PyRouter* self, visitproc visit, void* arg) {
   Py_VISIT(Py_TYPE(self));
   Py_VISIT(self->mod_);
-  auto result {self->httprouter_.traverse(
-      [&](PyObject* app) {
-        Py_VISIT(app);
-        return 0;
-      },
-      [](int v) { return v; })};
-  if(result)
-    return *result;
-  return 0;
+  return self->httprouter_
+      .traverse(
+          [&](PyObject* app) {
+            Py_VISIT(app);
+            return 0;
+          },
+          [](int v) { return v; })
+      .value_or(0);
 }
 
 int PyRouter::clear(PyRouter* self) {