Merge pull request #5541 from jmdavis/issue_17482

dlang-bot · web-flow · commit d07b10148dcf · 2017-07-08T00:09:30.000+02:00
Fix issue 17482: Fix Nullable!Variant equality checks.
merged-on-behalf-of: Sebastian Wilzbach &lt;sebi.wilzbach@gmail.com&gt;
diff --git a/std/typecons.d b/std/typecons.d
@@ -2228,7 +2228,8 @@ Params:
     }
 
     /// Ditto
-    bool opEquals()(auto ref const(T) rhs) const
+    bool opEquals(U)(auto ref const(U) rhs) const
+    if (is(typeof(this.get == rhs)))
     {
         return _isNull ? false : rhs == _value;
     }
@@ -2276,6 +2277,16 @@ Params:
         assert(a != Nullable!int(29));
     }
 
+    // Issue 17482
+    @system unittest
+    {
+        import std.variant : Variant;
+        Nullable!Variant a = Variant(12);
+        assert(a == 12);
+        Nullable!Variant e;
+        assert(e != 12);
+    }
+
     template toString()
     {
         import std.format : FormatSpec, formatValue;

Original file line number	Diff line number	Diff line change
`@@ -2228,7 +2228,8 @@ Params:`
`2228`	`2228`	`}`
`2229`	`2229`
`2230`	`2230`	`/// Ditto`
`2231`		`- bool opEquals()(auto ref const(T) rhs) const`
	`2231`	`+ bool opEquals(U)(auto ref const(U) rhs) const`
	`2232`	`+ if (is(typeof(this.get == rhs)))`
`2232`	`2233`	`{`
`2233`	`2234`	`return _isNull ? false : rhs == _value;`
`2234`	`2235`	`}`
`@@ -2276,6 +2277,16 @@ Params:`
`2276`	`2277`	`assert(a != Nullable!int(29));`
`2277`	`2278`	`}`
`2278`	`2279`
	`2280`	`+ // Issue 17482`
	`2281`	`+ @system unittest`
	`2282`	`+ {`
	`2283`	`+ import std.variant : Variant;`
	`2284`	`+ Nullable!Variant a = Variant(12);`
	`2285`	`+ assert(a == 12);`
	`2286`	`+ Nullable!Variant e;`
	`2287`	`+ assert(e != 12);`
	`2288`	`+ }`
	`2289`	`+`
`2279`	`2290`	`template toString()`
`2280`	`2291`	`{`
`2281`	`2292`	`import std.format : FormatSpec, formatValue;`