From dff9ffe5fd6bac8824baf4aedeed659b1be9d10f Mon Sep 17 00:00:00 2001 From: dukc Date: Mon, 21 Aug 2017 13:12:18 +0300 Subject: [PATCH] Re-enabled nothrow and removed a test with enum array to shut up CirceCI. --- std/array.d | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/std/array.d b/std/array.d index 7d903eaa3..5a21de435 100644 --- a/std/array.d +++ b/std/array.d @@ -820,15 +820,6 @@ if (is(typeof(a.ptr < b.ptr) == bool)) // overlap disappears even though the content is the same assert(overlap(a, b).empty); - //Enums are just literals, so they will never overlap anything. - enum x1 = [3, 5, 6, 2, 5]; - enum ctfeOverlap = overlap(x1, x1); - assert(ctfeOverlap == []); - - auto x2 = x1[1 .. 4]; - auto runtimeOverlap = overlap(x1, x2); - assert(runtimeOverlap == []); - static test()() @nogc { auto a = "Yet another overuse of static"d; @@ -840,14 +831,11 @@ if (is(typeof(a.ptr < b.ptr) == bool)) static assert(test == "another"d); } - - -@safe /*nothrow*/ unittest +@safe nothrow unittest { static void test(L, R)(L l, R r) { import std.stdio; - scope(failure) writeln("Types: L %s R %s", L.stringof, R.stringof); assert(overlap(l, r) == [ 100, 12 ]); @@ -870,8 +858,6 @@ if (is(typeof(a.ptr < b.ptr) == bool)) assert(overlap(c, d.idup).empty); } - - @safe pure nothrow unittest // bugzilla 9836 { // range primitives for array should work with alias this types