Don't call destroy on reference types when setting to none

Fixes #20
aliak00 · Aug 24, 2018 · 0c96802 · 0c96802
1 parent 560e6a2
commit 0c96802
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/source/optional/optional.d b/source/optional/optional.d
@@ -135,7 +135,11 @@ struct Optional(T) {
     */
     void opAssign()(const None) if (isMutable!T) {
         if (!this.empty) {
-            destroy(this._value);
+            static if (isNullInvalid) {
+                this._value = null;
+            } else {
+                destroy(this._value);
+            }
             this._empty = true;
         }
     }

diff --git a/tests/optional.d b/tests/optional.d
@@ -453,3 +453,18 @@ unittest {
     n = john.dispatch.residence.dispatch.numberOfRooms;
     assert(n == some(1));
 }
+
+@("Should not destroy references")
+unittest {
+    class C {
+        int i;
+        this(int ai) { i = ai; }
+    }
+
+    C my = new C(3);
+    Optional!C opt = some(my);
+    assert(my.i == 3);
+
+    opt = none;
+    assert(my.i == 3);
+}