From 6eba82fb564bd8216b95c68ca7560a90c54fc302 Mon Sep 17 00:00:00 2001 From: jmdavis Date: Sun, 19 Aug 2012 21:19:36 -0700 Subject: [PATCH] Slight tweak to static if in find. The semantics are the same. It's just less redundant this way. --- std/algorithm.d | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/std/algorithm.d b/std/algorithm.d index a44c8469e..eec019ebd 100644 --- a/std/algorithm.d +++ b/std/algorithm.d @@ -3216,7 +3216,7 @@ if (isRandomAccessRange!R1 && isForwardRange!R2 && !isBidirectionalRange!R2 && haystack = .find!pred(haystack, needle.front); - static if (hasLength!R1 && hasLength!R2 && is(typeof(takeNone(haystack)) == typeof(haystack))) + static if (hasLength!R1 && hasLength!R2 && is(typeof(takeNone(haystack)) == R1)) { if (needle.length > haystack.length) return takeNone(haystack); @@ -3240,9 +3240,9 @@ if (isRandomAccessRange!R1 && isForwardRange!R2 && !isBidirectionalRange!R2 && if (needle.empty || haystack.empty) return haystack; - static if(hasLength!R1 && is(typeof(takeNone(haystack)) == typeof(haystack))) + static if (hasLength!R1 && is(typeof(takeNone(haystack)) == R1)) { - if(matchLen == haystack.length) + if (matchLen == haystack.length) return takeNone(haystack); }