Merge pull request #4662 from Cauterite/patch-1

make Unique.opDot() inout

Author: WalterBright

std/typecons.d

@@ -164,7 +164,7 @@ public:
         return u;
     }
     /** Forwards member access to contents. */
-    RefT opDot() { return _p; }
+    auto opDot() inout { return _p; }
 
     /**
     Postblit operator is undefined to prevent the cloning of $(D Unique) objects.
@@ -288,6 +288,26 @@ private:
     assert(!uf2.isEmpty);
 }
 
+// ensure Unique behaves correctly through const access paths
+@system unittest
+{
+    struct Bar {int val;}
+    struct Foo
+    {
+        Unique!Bar bar = new Bar;
+    }
+
+    Foo foo;
+    foo.bar.val = 6;
+    const Foo* ptr = &foo;
+    static assert(is(typeof(ptr) == const(Foo*)));
+    static assert(is(typeof(ptr.bar) == const(Unique!Bar)));
+    static assert(is(typeof(ptr.bar.val) == const(int)));
+    assert(ptr.bar.val == 6);
+    foo.bar.val = 7;
+    assert(ptr.bar.val == 7);
+}
+
 // Used in Tuple.toString
 private template sharedToString(alias field)
     if (is(typeof(field) == shared))