Merge pull request #5135 from ntrel/swapRanges

JackStouffer · web-flow · commit a2a4db2df1ee · 2017-02-15T13:12:51.000-05:00
swapRanges: Remove redundant constraint tests
diff --git a/std/algorithm/mutation.d b/std/algorithm/mutation.d
@@ -2728,9 +2728,8 @@ Returns:
 */
 Tuple!(InputRange1, InputRange2)
 swapRanges(InputRange1, InputRange2)(InputRange1 r1, InputRange2 r2)
-    if (isInputRange!(InputRange1) && isInputRange!(InputRange2)
-            && hasSwappableElements!(InputRange1) && hasSwappableElements!(InputRange2)
-            && is(ElementType!(InputRange1) == ElementType!(InputRange2)))
+    if (hasSwappableElements!InputRange1 && hasSwappableElements!InputRange2
+        && is(ElementType!InputRange1 == ElementType!InputRange2))
 {
     for (; !r1.empty && !r2.empty; r1.popFront(), r2.popFront())
     {
diff --git a/std/range/primitives.d b/std/range/primitives.d
@@ -1261,7 +1261,7 @@ R r;
 static assert(isInputRange!R);
 swap(r.front, r.front);
 static if (isBidirectionalRange!R) swap(r.back, r.front);
-static if (isRandomAccessRange!R) swap(r[], r.front);
+static if (isRandomAccessRange!R) swap(r[0], r.front);
 ----
  */
 template hasSwappableElements(R)

Original file line number	Diff line number	Diff line change
`@@ -2728,9 +2728,8 @@ Returns:`
`2728`	`2728`	`*/`
`2729`	`2729`	`Tuple!(InputRange1, InputRange2)`
`2730`	`2730`	`swapRanges(InputRange1, InputRange2)(InputRange1 r1, InputRange2 r2)`
`2731`		`- if (isInputRange!(InputRange1) && isInputRange!(InputRange2)`
`2732`		`- && hasSwappableElements!(InputRange1) && hasSwappableElements!(InputRange2)`
`2733`		`- && is(ElementType!(InputRange1) == ElementType!(InputRange2)))`
	`2731`	`+ if (hasSwappableElements!InputRange1 && hasSwappableElements!InputRange2`
	`2732`	`+ && is(ElementType!InputRange1 == ElementType!InputRange2))`
`2734`	`2733`	`{`
`2735`	`2734`	`for (; !r1.empty && !r2.empty; r1.popFront(), r2.popFront())`
`2736`	`2735`	`{`