Merge pull request #4406 from wilzbach/fix_travis

Fix travis build

.travis.yml

@@ -17,8 +17,8 @@ script:
  # enforce whitespace between statements
  - grep -nE "(for|foreach|foreach_reverse|if|while|switch|catch)\(" $(find . -name '*.d'); test $? -eq 1
  # enforce whitespace between colon(:) for import statements (doesn't catch everything)
- - grep -n 'import [^/,=]*:' $(find . -name '*.d') | grep -vE 'import ([^ ]+) : '; echo $?
+ - grep -n 'import [^/,=]*:.*;' $(find . -name '*.d') | grep -vE "import ([^ ]+) :\s"; echo $?
  # enforce all-man style
- - grep -nE "(if|for|foreach|foreach_reverse|while|unittest|switch|else|version) .*{$"  $(find . -name '*.d'); test $? -eq 1
+ - grep -nE '(if|for|foreach|foreach_reverse|while|unittest|switch|else|version) .*{$'  $(find . -name '*.d'); test $? -eq 1
  # at the moment libdparse has problems to parse some modules (->excludes)
  - ./dsc --config .dscanner.ini --styleCheck $(find etc std -type f -name '*.d' | grep -vE 'std/traits.d|std/typecons.d|std/conv.d') -I.

std/algorithm/searching.d

@@ -1806,7 +1806,8 @@ if (isRandomAccessRange!R1 && hasLength!R1 && hasSlicing!R1 && isBidirectionalRa
                 if (!binaryFun!pred(haystack[k + i], needle[i]))
                     break;
             }
-            if (skip == 0) {
+            if (skip == 0)
+            {
                 skip = 1;
                 while (skip < needleLength && needle[needleLength - 1 - skip] != needle[needleLength - 1])
                 {

std/string.d

@@ -1480,7 +1480,7 @@ private ptrdiff_t indexOfAnyNeitherImpl(bool forward, bool any, Char, Char2)(
     }
     else
     {
-        import std.range.primitives: walkLength;
+        import std.range.primitives : walkLength;
         if (needles.length <= 16 && needles.walkLength(17))
         {
             size_t si = 0;