type_caster<std::optional>: support non-assignable types (#358)

wjakob · Nov 9, 2023 · 0c9b648 · 0c9b648
1 parent 61ca0f9
commit 0c9b648
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/include/nanobind/stl/optional.h b/include/nanobind/stl/optional.h
@@ -45,7 +45,7 @@ struct type_caster<std::optional<T>> {
             "type caster was registered to intercept this particular "
             "type, which is not allowed.");
 
-        value = caster.operator cast_t<T>();
+        value.emplace(caster.operator cast_t<T>());
 
         return true;
     }

diff --git a/tests/test_stl.cpp b/tests/test_stl.cpp
@@ -44,6 +44,12 @@ struct Copyable {
     ~Copyable() { destructed++; }
 };
 
+struct NonAssignable {
+  int value = 5;
+
+  NonAssignable &operator=(const NonAssignable &) = delete;
+};
+
 struct StructWithReadonlyMap {
     std::map<std::string, uint64_t> map;
 };
@@ -102,6 +108,10 @@ NB_MODULE(test_stl_ext, m) {
         .def(nb::init<int>())
         .def_rw("value", &Copyable::value);
 
+    nb::class_<NonAssignable>(m, "NonAssignable")
+        .def(nb::init<>())
+        .def_rw("value", &NonAssignable::value);
+
     nb::class_<StructWithReadonlyMap>(m, "StructWithReadonlyMap")
         .def(nb::init<>())
         .def_ro("map", &StructWithReadonlyMap::map);
@@ -254,6 +264,7 @@ NB_MODULE(test_stl_ext, m) {
     m.def("optional_ret_opt_none", []() { return std::optional<Movable>(); });
     m.def("optional_unbound_type", [](std::optional<int> &x) { return x; }, nb::arg("x") = nb::none());
     m.def("optional_unbound_type_with_nullopt_as_default", [](std::optional<int> &x) { return x; }, nb::arg("x") = std::nullopt);
+    m.def("optional_non_assignable", [](std::optional<NonAssignable> &x) { return x; });
 
     // ----- test43-test50 ------
     m.def("variant_copyable", [](std::variant<Copyable, int> &) {});

diff --git a/tests/test_stl.py b/tests/test_stl.py
@@ -448,6 +448,10 @@ def test42_std_optional_unbound_type():
         )
 
 
+def test42a_std_optional_non_assignable():
+    assert t.optional_non_assignable(t.NonAssignable()).value == 5
+
+
 def test43_std_variant_copyable(clean):
     t.variant_copyable(t.Copyable())
     t.variant_copyable(5)