Merge pull request #6869 from wilzbach/fix-d_do_test

Fix deprecations in d_do_test merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>
dlang · Jun 11, 2017 · c6c3c11 · c6c3c11
2 parents e07c3de + 810e57e
commit c6c3c11
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/test/d_do_test.d b/test/d_do_test.d
@@ -405,6 +405,8 @@ bool collectExtraSources (in string input_dir, in string output_dir, in string[]
 // marked by $n$ that contain compiler generated unique numbers
 bool compareOutput(string output, string refoutput)
 {
+    import std.ascii : digits;
+    import std.utf : byCodeUnit;
     for ( ; ; )
     {
         auto pos = refoutput.indexOf("$n$");
@@ -416,7 +418,8 @@ bool compareOutput(string output, string refoutput)
             return false;
         refoutput = refoutput[pos + 3 ..$];
         output = output[pos..$];
-        munch(output, "0123456789");
+        auto p = output.byCodeUnit.countUntil!(e => !digits.canFind(e));
+        output = output[p..$];
     }
 }