Merge pull request #5588 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
This commit is contained in:
The Dlang Bot 2017-07-10 06:19:50 +02:00 committed by GitHub
commit 024858c6de
3 changed files with 15 additions and 9 deletions

View file

@ -7,12 +7,12 @@ $(DIVC quickindex,
$(BOOKTABLE ,
$(TR $(TH Category) $(TH Functions)
)
$(TR $(TDNW Template API) $(TD $(MYREF CRC32)
$(TR $(TDNW Template API) $(TD $(MYREF CRC) $(MYREF CRC32) $(MYREF CRC64ECMA) $(MYREF CRC64ISO)
)
)
$(TR $(TDNW OOP API) $(TD $(MYREF CRC32Digest))
$(TR $(TDNW OOP API) $(TD $(MYREF CRC32Digest) $(MYREF CRC64ECMADigest) $(MYREF CRC64ISODigest))
)
$(TR $(TDNW Helpers) $(TD $(MYREF crcHexString) $(MYREF crc32Of))
$(TR $(TDNW Helpers) $(TD $(MYREF crcHexString) $(MYREF crc32Of) $(MYREF crc64ECMAOf) $(MYREF crc64ISOOf))
)
)
)

View file

@ -11,7 +11,6 @@ $(TR $(TH Category) $(TH Functions) )
$(TR $(TDNW Searching)
$(TD
$(MYREF column)
$(MYREF inPattern)
$(MYREF indexOf)
$(MYREF indexOfAny)
$(MYREF indexOfNeither)
@ -22,16 +21,12 @@ $(TR $(TDNW Searching)
)
$(TR $(TDNW Comparison)
$(TD
$(MYREF countchars)
$(MYREF isNumeric)
)
)
$(TR $(TDNW Mutation)
$(TD
$(MYREF capitalize)
$(MYREF munch)
$(MYREF removechars)
$(MYREF squeeze)
)
)
$(TR $(TDNW Pruning and Filling)

View file

@ -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;