From 8a8413b758ffad8013efbec90b277bc2832a238e Mon Sep 17 00:00:00 2001 From: Rainer Schuetze Date: Sat, 21 Sep 2013 14:17:26 +0200 Subject: [PATCH 1/2] adjust to changes in druntime by https://github.com/D-Programming-Language/druntime/pull/611 --- std/traits.d | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/std/traits.d b/std/traits.d index 27249fa9b9a..72e0e77d077 100644 --- a/std/traits.d +++ b/std/traits.d @@ -5832,10 +5832,12 @@ unittest // Test for bug 5718 import std.demangle; int foo; - assert(demangle(mangledName!foo)[$-7 .. $] == "int foo"); + auto foo_demangled = demangle(mangledName!foo); + assert(foo_demangled[0 .. 4] == "int " && foo_demangled[$-3 .. $] == "foo"); void bar(){} - assert(demangle(mangledName!bar)[$-10 .. $] == "void bar()"); + auto bar_demangled = demangle(mangledName!bar); + assert(bar_demangled[0 .. 5] == "void " && bar_demangled[$-5 .. $] == "bar()"); } From 8518a396492f3e6adfcadb7f83592232aecc132c Mon Sep 17 00:00:00 2001 From: Rainer Schuetze Date: Sat, 21 Sep 2013 15:08:33 +0200 Subject: [PATCH 2/2] temporarily disable demangle unittest --- std/traits.d | 1 + 1 file changed, 1 insertion(+) diff --git a/std/traits.d b/std/traits.d index 72e0e77d077..d5d60924a0d 100644 --- a/std/traits.d +++ b/std/traits.d @@ -5827,6 +5827,7 @@ unittest static assert(mangledName!((int a) { return a+x; }) == "DFNbNfiZi"); // nothrow safe } +version(none) // disabled until druntime pull #611 is merged unittest { // Test for bug 5718