fixup

timotheecour · timotheecour · commit 0811a32e3650 · 2018-02-22T01:59:50.000-08:00
diff --git a/std/array.d b/std/array.d
@@ -4094,14 +4094,15 @@ auto asStaticCast(U, alias arr)() @nogc
     asStaticCast!(byte, 2.iota).assertSame!byte([0, 1]);
 }
 
-version (unittest) void assertSame(T, T1, T2)(T1 a, T2 b) @nogc
+// Note: can't use `version (unittest)` because of https://issues.dlang.org/show_bug.cgi?id=18488
+void assertSame(T, T1, T2)(T1 a, T2 b) @nogc
 {
     assert(is(T1 == T[T1.length]));
     assert(a == b);
 }
 
 // TODO: add this to assertThrown in std.exception
-package(std) bool isThrown(T : Throwable = Exception, E)(lazy E expression) @system
+bool isThrown(T : Throwable = Exception, E)(lazy E expression) @system
 {
     try
     {

Original file line number	Diff line number	Diff line change
`@@ -4094,14 +4094,15 @@ auto asStaticCast(U, alias arr)() @nogc`
`4094`	`4094`	`asStaticCast!(byte, 2.iota).assertSame!byte([0, 1]);`
`4095`	`4095`	`}`
`4096`	`4096`
`4097`		`-version (unittest) void assertSame(T, T1, T2)(T1 a, T2 b) @nogc`
	`4097`	+// Note: can't use `version (unittest)` because of https://issues.dlang.org/show_bug.cgi?id=18488
	`4098`	`+void assertSame(T, T1, T2)(T1 a, T2 b) @nogc`
`4098`	`4099`	`{`
`4099`	`4100`	`assert(is(T1 == T[T1.length]));`
`4100`	`4101`	`assert(a == b);`
`4101`	`4102`	`}`
`4102`	`4103`
`4103`	`4104`	`// TODO: add this to assertThrown in std.exception`
`4104`		`-package(std) bool isThrown(T : Throwable = Exception, E)(lazy E expression) @system`
	`4105`	`+bool isThrown(T : Throwable = Exception, E)(lazy E expression) @system`
`4105`	`4106`	`{`
`4106`	`4107`	`try`
`4107`	`4108`	`{`