From 810e57ee216379f8165bcafed43afea8403c6f33 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Thu, 8 Jun 2017 05:47:00 +0200
Subject: [PATCH] Fix deprecations in d_do_test

---
 test/d_do_test.d | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/d_do_test.d b/test/d_do_test.d
index dcddeabacb64..5f3e5c51c8d5 100755
--- 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..$];
     }
 }