Merge remote-tracking branch 'upstream/master' into stable

Author: ibuclaw

changelog/permutation_assert_message.dd

@@ -0,0 +1,8 @@
+Better static assert messages for `std.algorithm.iteration.permutations`
+
+Until now, `permutations` used a template constraint to check if the passed types
+could be used. If they were not, it was very tedious to figure out why.
+
+As the template constraint is not used for overload resolution
+the constrains are moved into static asserts with expressive error
+messages.

changelog/std_system_instruction_set_architecture.dd

@@ -0,0 +1,15 @@
+Added `std.system.instructionSetArchitecture` and `std.system.ISA`
+
+A new enum representing the instruction set architecture for the targeted
+system was added. It is intended for cases where a targeted CPU's ISA is only
+needed at runtime, such as providing human-readable messages as demonstrated
+below.
+-------
+import std.stdio;
+import std.system;
+
+void main()
+{
+    writeln("Hello ", instructionSetArchitecture, " world!");
+}
+-------

posix.mak

@@ -74,7 +74,7 @@ ROOT_OF_THEM_ALL = generated
 ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)
 DUB=dub
 TOOLS_DIR=../tools
-DSCANNER_HASH=d5d6920502bf1bfdb29474007a59fd606df0aadc
+DSCANNER_HASH=5a53c538d0aa832f03840840271b6631fbbfc53d
 DSCANNER_DIR=$(ROOT_OF_THEM_ALL)/dscanner-$(DSCANNER_HASH)
 
 # Set DRUNTIME name and full path

std/algorithm/iteration.d

@@ -2026,7 +2026,7 @@ private struct ChunkByGroup(alias eq, Range, bool eqEquivalenceAssured)
         }
     }
 
-    // Cannot be a copy constructor due to issue 22239
+    // Cannot be a copy constructor due to https://issues.dlang.org/show_bug.cgi?id=22239
     this(this) @trusted
     {
         import core.lifetime : emplace;
@@ -2128,7 +2128,7 @@ if (isForwardRange!Range)
         }();
     }
 
-    // Cannot be a copy constructor due to issue 22239
+    // Cannot be a copy constructor due to https://issues.dlang.org/show_bug.cgi?id=22239
     this(this) @trusted
     {
         import core.lifetime : emplace;
@@ -7939,15 +7939,23 @@ See_Also:
 $(REF nextPermutation, std,algorithm,sorting).
 */
 Permutations!Range permutations(Range)(Range r)
-if (isRandomAccessRange!Range && hasLength!Range)
 {
+    static assert(isRandomAccessRange!Range, Range.stringof,
+            " must be a RandomAccessRange");
+    static assert(hasLength!Range, Range.stringof
+            , " must have a length");
+
     return typeof(return)(r);
 }
 
 /// ditto
 struct Permutations(Range)
-if (isRandomAccessRange!Range && hasLength!Range)
 {
+    static assert(isRandomAccessRange!Range, Range.stringof,
+            " must be a RandomAccessRange");
+    static assert(hasLength!Range, Range.stringof
+            , " must have a length");
+
     private size_t[] _indices, _state;
     private Range _r;
     private bool _empty;

std/algorithm/mutation.d

@@ -3049,7 +3049,7 @@ if (isBlitAssignable!T && !is(typeof(lhs.proxySwap(rhs))))
     swap(b1, b2);
 }
 
-// issue 20732
+// https://issues.dlang.org/show_bug.cgi?id=20732
 @safe unittest
 {
     static struct A

std/algorithm/searching.d

@@ -1282,7 +1282,7 @@ if (isInputRange!R &&
 
 @safe pure unittest
 {
-    //example from issue 19727
+    //example from https://issues.dlang.org/show_bug.cgi?id=19727
     import std.path : asRelativePath;
     string[] ext = ["abc", "def", "ghi"];
     string path = "/foo/file.def";
@@ -1315,19 +1315,12 @@ in
 }
 do
 {
-    import std.typecons : Rebindable;
+    import std.typecons : Rebindable2;
 
     alias Element = ElementType!Range;
-    Rebindable!Element seed = r.front;
+    auto seed = Rebindable2!Element(r.front);
     r.popFront();
-    static if (is(typeof(seed) == Unqual!Element))
-    {
-        return extremum!(map, selector)(r, seed);
-    }
-    else
-    {
-        return extremum!(map, selector)(r, seed.get);
-    }
+    return extremum!(map, selector)(r, seed.get);
 }
 
 private auto extremum(alias map, alias selector = "a < b", Range,
@@ -1337,35 +1330,24 @@ if (isInputRange!Range && !isInfinite!Range &&
     !is(CommonType!(ElementType!Range, RangeElementType) == void) &&
      is(typeof(unaryFun!map(ElementType!(Range).init))))
 {
-    import std.typecons : Rebindable;
+    import std.typecons : Rebindable2;
 
     alias mapFun = unaryFun!map;
     alias selectorFun = binaryFun!selector;
 
     alias Element = ElementType!Range;
     alias CommonElement = CommonType!(Element, RangeElementType);
-    Rebindable!CommonElement extremeElement = seedElement;
+    auto extremeElement = Rebindable2!CommonElement(seedElement);
 
     // if we only have one statement in the loop, it can be optimized a lot better
     static if (__traits(isSame, map, a => a))
     {
-        CommonElement getExtremeElement()
-        {
-            static if (is(typeof(extremeElement) == Unqual!CommonElement))
-            {
-                return extremeElement;
-            }
-            else
-            {
-                return extremeElement.get;
-            }
-        }
         // direct access via a random access range is faster
         static if (isRandomAccessRange!Range)
         {
             foreach (const i; 0 .. r.length)
             {
-                if (selectorFun(r[i], getExtremeElement))
+                if (selectorFun(r[i], extremeElement.get))
                 {
                     extremeElement = r[i];
                 }
@@ -1375,7 +1357,7 @@ if (isInputRange!Range && !isInfinite!Range &&
         {
             while (!r.empty)
             {
-                if (selectorFun(r.front, getExtremeElement))
+                if (selectorFun(r.front, extremeElement.get))
                 {
                     extremeElement = r.front;
                 }
@@ -1386,7 +1368,7 @@ if (isInputRange!Range && !isInfinite!Range &&
     else
     {
         alias MapType = Unqual!(typeof(mapFun(CommonElement.init)));
-        MapType extremeElementMapped = mapFun(extremeElement);
+        MapType extremeElementMapped = mapFun(extremeElement.get);
 
         // direct access via a random access range is faster
         static if (isRandomAccessRange!Range)
@@ -1415,15 +1397,7 @@ if (isInputRange!Range && !isInfinite!Range &&
             }
         }
     }
-    // For several cases, such as classes or arrays, Rebindable!T aliases itself to T or Unqual!T.
-    static if (is(typeof(extremeElement) == Unqual!CommonElement))
-    {
-        return extremeElement;
-    }
-    else
-    {
-        return extremeElement.get;
-    }
+    return extremeElement.get;
 }
 
 private auto extremum(alias selector = "a < b", Range)(Range r)
@@ -1555,7 +1529,7 @@ if (isInputRange!Range && !isInfinite!Range &&
 }
 
 // https://issues.dlang.org/show_bug.cgi?id=24027
-@safe nothrow pure unittest
+@safe nothrow unittest
 {
     class A
     {
@@ -2336,7 +2310,7 @@ private R1 simpleMindedFind(alias pred, R1, R2)(R1 haystack, scope R2 needle)
     @safe:
         string _impl;
 
-        // This is what triggers issue 7992.
+        // This is what triggers https://issues.dlang.org/show_bug.cgi?id=7992.
         @property size_t length() const { return _impl.length; }
         @property void length(size_t len) { _impl.length = len; }
 
@@ -2349,7 +2323,7 @@ private R1 simpleMindedFind(alias pred, R1, R2)(R1 haystack, scope R2 needle)
         @property CustomString save() { return this; }
     }
 
-    // If issue 7992 occurs, this will throw an exception from calling
+    // If https://issues.dlang.org/show_bug.cgi?id=7992 occurs, this will throw an exception from calling
     // popFront() on an empty range.
     auto r = find(CustomString("a"), CustomString("b"));
     assert(r.empty);

std/bigint.d

@@ -254,11 +254,11 @@ public:
 
         static if (op=="+")
         {
-            data = BigUint.addOrSubInt(data, u, sign != (y<0), sign);
+            data = BigUint.addOrSubInt!ulong(data, u, wantSub: sign != (y<0), sign);
         }
         else static if (op=="-")
         {
-            data = BigUint.addOrSubInt(data, u, sign == (y<0), sign);
+            data = BigUint.addOrSubInt!ulong(data, u, wantSub: sign == (y<0), sign);
         }
         else static if (op=="*")
         {
@@ -323,7 +323,15 @@ public:
         else static if (op=="^^")
         {
             sign = (y & 1) ? sign : false;
-            data = BigUint.pow(data, u);
+            if (y < 0)
+            {
+                checkDivByZero();
+                data = cast(ulong) (data == 1);
+            }
+            else
+            {
+                data = BigUint.pow(data, u);
+            }
         }
         else static if (op=="&")
         {
@@ -411,6 +419,19 @@ public:
         ));
     }
 
+    // https://issues.dlang.org/show_bug.cgi?id=24028
+    @system unittest
+    {
+        import std.exception : assertThrown;
+        import core.exception : AssertError;
+
+        assert(BigInt(100) ^^ -1 == BigInt(0));
+        assert(BigInt(1) ^^ -1 == BigInt(1));
+        assert(BigInt(-1) ^^ -1 == BigInt(-1));
+        assert(BigInt(-1) ^^ -2 == BigInt(1));
+        assertThrown!AssertError(BigInt(0) ^^ -1);
+    }
+
     /**
      * Implements assignment operators of the form `BigInt op= BigInt`.
      */
@@ -613,7 +634,7 @@ public:
         static if (op == "-")
         {
             r.sign = sign;
-            r.data = BigUint.addOrSubInt(data, u, sign == (y<0), r.sign);
+            r.data = BigUint.addOrSubInt!ulong(data, u, wantSub: sign == (y<0), r.sign);
             r.negate();
         }
         return r;
@@ -670,12 +691,12 @@ public:
     {
         static if (op=="++")
         {
-            data = BigUint.addOrSubInt(data, 1UL, sign, sign);
+            data = BigUint.addOrSubInt!ulong(data, 1UL, wantSub: sign, sign);
             return this;
         }
         else static if (op=="--")
         {
-            data = BigUint.addOrSubInt(data, 1UL, !sign, sign);
+            data = BigUint.addOrSubInt!ulong(data, 1UL, wantSub: !sign, sign);
             return this;
         }
     }

std/checkedint.d

@@ -2129,16 +2129,16 @@ static:
         {
             // Not value convertible, only viable option is rhs fits within the
             // bounds of Lhs
-            static if (ProperCompare.hookOpCmp(Rhs.min, Lhs.min) < 0)
+            static if (ProperCompare.hookOpCmp!(Rhs, Lhs)(lhs: Rhs.min, rhs: Lhs.min) < 0)
             {
                 // Example: hookOpCast!short(int(42)), hookOpCast!uint(int(42))
-                if (ProperCompare.hookOpCmp(rhs, Lhs.min) < 0)
+                if (ProperCompare.hookOpCmp!(Rhs, Lhs)(lhs: rhs, rhs: Lhs.min) < 0)
                     return defaultValue!Lhs;
             }
-            static if (ProperCompare.hookOpCmp(Rhs.max, Lhs.max) > 0)
+            static if (ProperCompare.hookOpCmp!(Rhs, Lhs)(lhs: Rhs.max, rhs: Lhs.max) > 0)
             {
                 // Example: hookOpCast!int(uint(42))
-                if (ProperCompare.hookOpCmp(rhs, Lhs.max) > 0)
+                if (ProperCompare.hookOpCmp!(Rhs, Lhs)(lhs: rhs, rhs: Lhs.max) > 0)
                     return defaultValue!Lhs;
             }
             return cast(Lhs) rhs;

std/complex.d

@@ -1066,7 +1066,7 @@ Complex!T asin(T)(Complex!T z)  @safe pure nothrow @nogc
 {
     import std.math.operations : isClose;
     import std.math.constants : PI;
-    version (DigitalMars) {} else // Disabled because of issue 21376
+    version (DigitalMars) {} else // Disabled because of https://issues.dlang.org/show_bug.cgi?id=21376
     assert(isClose(asin(complex(0.5f)), float(PI) / 6));
 }
 
@@ -1092,7 +1092,7 @@ Complex!T acos(T)(Complex!T z)  @safe pure nothrow @nogc
 {
     import std.math.operations : isClose;
     import std.math.constants : PI;
-    version (DigitalMars) {} else // Disabled because of issue 21376
+    version (DigitalMars) {} else // Disabled because of https://issues.dlang.org/show_bug.cgi?id=21376
     assert(isClose(acos(complex(0.5f)), float(PI) / 3));
 }
 

std/container/array.d

@@ -1566,7 +1566,7 @@ if (!is(immutable T == immutable bool))
     r2[0 .. 0] += 0;
 }
 
-// Test issue 11194
+// Test https://issues.dlang.org/show_bug.cgi?id=11194
 @system unittest
 {
     static struct S {