mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-29 22:50:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replaced version(unittest) blocks with version(StdUnittest)

Browse source
This commit is contained in:
Jack Stouffer 2018-02-01 16:06:09 -05:00
parent b959f6b53e
commit 18cbb29b04
44 changed files with 79 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
std/algorithm/internal.d
View file

@ -14,7 +14,7 @@ package template algoFormat()
} }
// Internal random array generators // Internal random array generators
version(unittest) version(StdUnittest)
{ {
package enum size_t maxArraySize = 50; package enum size_t maxArraySize = 50;
package enum size_t minArraySize = maxArraySize - 1; package enum size_t minArraySize = maxArraySize - 1;

4
std/algorithm/sorting.d
View file

@ -637,7 +637,7 @@ if (isRandomAccessRange!Range && hasLength!Range && hasSlicing!Range)
for (;;) for (;;)
{ {
// Loop invariant // Loop invariant
version(unittest) version(StdUnittest)
{ {
import std.algorithm.searching : all; import std.algorithm.searching : all;
assert(r[0 .. lo].all!(x => !lt(p, x))); assert(r[0 .. lo].all!(x => !lt(p, x)));
@ -3439,7 +3439,7 @@ done:
a.length / 2 + 1); a.length / 2 + 1);
} }
version(unittest) version(StdUnittest)
private T[] randomArray(Flag!"exactSize" flag = No.exactSize, T = int)( private T[] randomArray(Flag!"exactSize" flag = No.exactSize, T = int)(
size_t maxSize = 1000, size_t maxSize = 1000,
T minValue = 0, T maxValue = 255) T minValue = 0, T maxValue = 255)

4
std/array.d
View file

@ -550,7 +550,7 @@ private template blockAttribute(T)
enum blockAttribute = GC.BlkAttr.NO_SCAN; enum blockAttribute = GC.BlkAttr.NO_SCAN;
} }
} }
version(unittest) version(StdUnittest)
{ {
import core.memory : UGC = GC; import core.memory : UGC = GC;
static assert(!(blockAttribute!void & UGC.BlkAttr.NO_SCAN)); static assert(!(blockAttribute!void & UGC.BlkAttr.NO_SCAN));
@ -569,7 +569,7 @@ private template nDimensions(T)
} }
} }
version(unittest) version(StdUnittest)
{ {
static assert(nDimensions!(uint[]) == 1); static assert(nDimensions!(uint[]) == 1);
static assert(nDimensions!(float[][]) == 2); static assert(nDimensions!(float[][]) == 2);

2
std/ascii.d
View file

@ -59,7 +59,7 @@ $(TR $(TD Enums) $(TD
+/ +/
module std.ascii; module std.ascii;
version (unittest) version(StdUnittest)
{ {
// FIXME: When dmd bug #314 is fixed, make these selective. // FIXME: When dmd bug #314 is fixed, make these selective.
import std.meta; // : AliasSeq; import std.meta; // : AliasSeq;

2
std/bitmanip.d
View file

@ -58,7 +58,7 @@ import std.range.primitives;
public import std.system : Endian; public import std.system : Endian;
import std.traits; import std.traits;
version(unittest) version(StdUnittest)
{ {
import std.stdio; import std.stdio;
} }

2
std/concurrency.d
View file

@ -2427,7 +2427,7 @@ private
} }
} }
version (unittest) version(StdUnittest)
{ {
import std.stdio; import std.stdio;
import std.typecons : tuple, Tuple; import std.typecons : tuple, Tuple;

4
std/container/rbtree.d
View file

@ -61,7 +61,7 @@ import std.functional : binaryFun;
public import std.container.util; public import std.container.util;
version(unittest) debug = RBDoChecks; version(StdUnittest) debug = RBDoChecks;
//debug = RBDoChecks; //debug = RBDoChecks;
@ -745,7 +745,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
alias _less = binaryFun!less; alias _less = binaryFun!less;
version(unittest) version(StdUnittest)
{ {
static if (is(typeof(less) == string)) static if (is(typeof(less) == string))
{ {

6
std/conv.d
View file

@ -4882,7 +4882,7 @@ if (!is(T == class))
assert(u1.a == "hello"); assert(u1.a == "hello");
} }
version(unittest) private struct __conv_EmplaceTest version(StdUnittest) private struct __conv_EmplaceTest
{ {
int i = 3; int i = 3;
this(int i) this(int i)
@ -4903,7 +4903,7 @@ version(unittest) private struct __conv_EmplaceTest
void opAssign(); void opAssign();
} }
version(unittest) private class __conv_EmplaceTestClass version(StdUnittest) private class __conv_EmplaceTestClass
{ {
int i = 3; int i = 3;
this(int i) @nogc @safe pure nothrow this(int i) @nogc @safe pure nothrow
@ -5323,7 +5323,7 @@ version(unittest) private class __conv_EmplaceTestClass
assert(s.i == 2); assert(s.i == 2);
} }
} }
version(unittest) version(StdUnittest)
{ {
//Ambiguity //Ambiguity
struct __std_conv_S struct __std_conv_S

4
std/datetime/date.d
View file

@ -14,7 +14,7 @@ import std.traits : isSomeString, Unqual;
import std.typecons : Flag; import std.typecons : Flag;
import std.range.primitives : isOutputRange; import std.range.primitives : isOutputRange;
version(unittest) import std.exception : assertThrown; version(StdUnittest) import std.exception : assertThrown;
@safe unittest @safe unittest
{ {
@ -10272,7 +10272,7 @@ if (isSomeString!T)
} }
version(unittest) version(StdUnittest)
{ {
// All of these helper arrays are sorted in ascending order. // All of these helper arrays are sorted in ascending order.
auto testYearsBC = [-1999, -1200, -600, -4, -1, 0]; auto testYearsBC = [-1999, -1200, -600, -4, -1, 0];

2
std/datetime/interval.d
View file

@ -14,7 +14,7 @@ import std.exception : enforce;
import std.traits : isIntegral, Unqual; import std.traits : isIntegral, Unqual;
import std.typecons : Flag; import std.typecons : Flag;
version(unittest) import std.exception : assertThrown; version(StdUnittest) import std.exception : assertThrown;
/++ /++

8
std/datetime/systime.d
View file

@ -31,7 +31,7 @@ else version(Posix)
import core.sys.posix.sys.types : time_t; import core.sys.posix.sys.types : time_t;
} }
version(unittest) version(StdUnittest)
{ {
import core.exception : AssertError; import core.exception : AssertError;
import std.exception : assertThrown; import std.exception : assertThrown;
@ -9699,7 +9699,7 @@ afterMon: stripAndCheckLen(value[3 .. value.length], "1200:00A".length);
assertThrown!DateTimeException(parseRFC822DateTime(badStr)); assertThrown!DateTimeException(parseRFC822DateTime(badStr));
} }
version(unittest) void testParse822(alias cr)(string str, SysTime expected, size_t line = __LINE__) version(StdUnittest) void testParse822(alias cr)(string str, SysTime expected, size_t line = __LINE__)
{ {
import std.format : format; import std.format : format;
auto value = cr(str); auto value = cr(str);
@ -9708,7 +9708,7 @@ version(unittest) void testParse822(alias cr)(string str, SysTime expected, size
throw new AssertError(format("wrong result. expected [%s], actual[%s]", expected, result), __FILE__, line); throw new AssertError(format("wrong result. expected [%s], actual[%s]", expected, result), __FILE__, line);
} }
version(unittest) void testBadParse822(alias cr)(string str, size_t line = __LINE__) version(StdUnittest) void testBadParse822(alias cr)(string str, size_t line = __LINE__)
{ {
try try
parseRFC822DateTime(cr(str)); parseRFC822DateTime(cr(str));
@ -10636,7 +10636,7 @@ if (isIntegral!T && isSigned!T) // The constraints on R were already covered by
} }
version(unittest) version(StdUnittest)
{ {
// Variables to help in testing. // Variables to help in testing.
Duration currLocalDiffFromUTC; Duration currLocalDiffFromUTC;

2
std/datetime/timezone.d
View file

@ -33,7 +33,7 @@ else version(Posix)
import core.sys.posix.sys.types : time_t; import core.sys.posix.sys.types : time_t;
} }
version(unittest) import std.exception : assertThrown; version(StdUnittest) import std.exception : assertThrown;
/++ /++

3
std/digest/crc.d
View file

@ -60,8 +60,7 @@ module std.digest.crc;
public import std.digest; public import std.digest;
version(unittest) version(StdUnittest) import std.exception;
import std.exception;
/// ///

2
std/digest/hmac.d
View file

@ -287,7 +287,7 @@ if (isDigest!H)
} }
} }
version(unittest) version(StdUnittest)
{ {
import std.digest : toHexString, LetterCase; import std.digest : toHexString, LetterCase;
alias hex = toHexString!(LetterCase.lower); alias hex = toHexString!(LetterCase.lower);

2
std/digest/murmurhash.d
View file

@ -658,7 +658,7 @@ L_end:
} }
} }
version (unittest) version(StdUnittest)
{ {
import std.string : representation; import std.string : representation;

2
std/digest/sha.d
View file

@ -118,7 +118,7 @@ else version(D_InlineAsm_X86_64)
version(LittleEndian) import core.bitop : bswap; version(LittleEndian) import core.bitop : bswap;
version(unittest) version(StdUnittest)
{ {
import std.exception; import std.exception;
} }

2
std/encoding.d
View file

@ -3634,7 +3634,7 @@ class EncodingSchemeUtf32Native : EncodingScheme
// Helper functions // Helper functions
version(unittest) version(StdUnittest)
{ {
void transcodeReverse(Src,Dst)(immutable(Src)[] s, out immutable(Dst)[] r) void transcodeReverse(Src,Dst)(immutable(Src)[] s, out immutable(Dst)[] r)
{ {

2
std/exception.d
View file

@ -1752,7 +1752,7 @@ CommonType!(T1, T2) ifThrown(T1, T2)(lazy scope T1 expression, scope T2 delegate
static assert(!__traits(compiles, (new Object()).ifThrown(e=>1))); static assert(!__traits(compiles, (new Object()).ifThrown(e=>1)));
} }
version(unittest) package version(StdUnittest) package
@property void assertCTFEable(alias dg)() @property void assertCTFEable(alias dg)()
{ {
static assert({ cast(void) dg(); return true; }()); static assert({ cast(void) dg(); return true; }());

2
std/experimental/allocator/building_blocks/allocator_list.d
View file

@ -7,7 +7,7 @@ module std.experimental.allocator.building_blocks.allocator_list;
import std.experimental.allocator.building_blocks.null_allocator; import std.experimental.allocator.building_blocks.null_allocator;
import std.experimental.allocator.common; import std.experimental.allocator.common;
import std.experimental.allocator.gc_allocator; import std.experimental.allocator.gc_allocator;
version(unittest) import std.stdio; version(StdUnittest) import std.stdio;
// Turn this on for debugging // Turn this on for debugging
// debug = allocator_list; // debug = allocator_list;

2
std/experimental/allocator/building_blocks/kernighan_ritchie.d
View file

@ -6,7 +6,7 @@ module std.experimental.allocator.building_blocks.kernighan_ritchie;
import std.experimental.allocator.building_blocks.null_allocator; import std.experimental.allocator.building_blocks.null_allocator;
//debug = KRRegion; //debug = KRRegion;
version(unittest) import std.conv : text; version(StdUnittest) import std.conv : text;
debug(KRRegion) import std.stdio; debug(KRRegion) import std.stdio;
// KRRegion // KRRegion

2
std/experimental/allocator/common.d
View file

@ -479,7 +479,7 @@ Forwards each of the methods in `funs` (if defined) to `member`.
return result; return result;
} }
version(unittest) version(StdUnittest)
{ {
import std.experimental.allocator : RCIAllocator, RCISharedAllocator; import std.experimental.allocator : RCIAllocator, RCISharedAllocator;

2
std/experimental/allocator/mallocator.d
View file

@ -354,7 +354,7 @@ struct AlignedMallocator
//... //...
} }
version(unittest) version(CRuntime_DigitalMars) version(StdUnittest) version(CRuntime_DigitalMars)
@nogc nothrow @nogc nothrow
size_t addr(ref void* ptr) { return cast(size_t) ptr; } size_t addr(ref void* ptr) { return cast(size_t) ptr; }

2
std/experimental/allocator/package.d
View file

@ -1930,7 +1930,7 @@ if (isInputRange!R && !isInfinite!R)
assert(arr2.map!`a.val`.equal(iota(32, 204, 2))); assert(arr2.map!`a.val`.equal(iota(32, 204, 2)));
} }
version(unittest) version(StdUnittest)
{ {
private struct ForcedInputRange private struct ForcedInputRange
{ {

2
std/experimental/logger/core.d
View file

@ -1846,7 +1846,7 @@ package class TestLogger : Logger
} }
} }
version(unittest) private void testFuncNames(Logger logger) @safe version(StdUnittest) private void testFuncNames(Logger logger) @safe
{ {
string s = "I'm here"; string s = "I'm here";
logger.log(s); logger.log(s);

2
std/file.d
View file

@ -132,7 +132,7 @@ else
return _deleteme; return _deleteme;
} }
version (unittest) private struct TestAliasedString version(StdUnittest) private struct TestAliasedString
{ {
string get() @safe @nogc pure nothrow { return _s; } string get() @safe @nogc pure nothrow { return _s; }
alias get this; alias get this;

12
std/format.d
View file

@ -4344,7 +4344,7 @@ private T getNth(string kind, alias Condition, T, A...)(uint index, A args)
/* ======================== Unit Tests ====================================== */ /* ======================== Unit Tests ====================================== */
version(unittest) version(StdUnittest)
void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __FILE__) void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __FILE__)
{ {
import core.exception : AssertError; import core.exception : AssertError;
@ -4358,7 +4358,7 @@ void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __F
text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln); text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln);
} }
version(unittest) version(StdUnittest)
void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, string fn = __FILE__) @safe void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, string fn = __FILE__) @safe
{ {
import core.exception : AssertError; import core.exception : AssertError;
@ -4371,7 +4371,7 @@ void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, str
text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln); text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln);
} }
version(unittest) version(StdUnittest)
void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__) void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__)
{ {
import core.exception : AssertError; import core.exception : AssertError;
@ -4389,7 +4389,7 @@ void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = _
text("expected one of `", expected, "`, result = `", w.data, "`"), fn, ln); text("expected one of `", expected, "`, result = `", w.data, "`"), fn, ln);
} }
version(unittest) version(StdUnittest)
void formatTest(T)(string fmt, T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__) @safe void formatTest(T)(string fmt, T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__) @safe
{ {
import core.exception : AssertError; import core.exception : AssertError;
@ -4871,7 +4871,7 @@ here:
assert(a == "hello" && b == 124 && c == 34.5); assert(a == "hello" && b == 124 && c == 34.5);
} }
version(unittest) version(StdUnittest)
void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = __FILE__, size_t ln = __LINE__) void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = __FILE__, size_t ln = __LINE__)
{ {
import core.exception : AssertError; import core.exception : AssertError;
@ -4913,7 +4913,7 @@ void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = _
input, fn, ln); input, fn, ln);
} }
version(unittest) version(StdUnittest)
void formatReflectTest(T)(ref T val, string fmt, string[] formatted, string fn = __FILE__, size_t ln = __LINE__) void formatReflectTest(T)(ref T val, string fmt, string[] formatted, string fn = __FILE__, size_t ln = __LINE__)
{ {
import core.exception : AssertError; import core.exception : AssertError;

2
std/math.d
View file

@ -175,7 +175,7 @@ else version (X86)
private alias haveSSE = core.cpuid.sse; private alias haveSSE = core.cpuid.sse;
} }
version(unittest) version(StdUnittest)
{ {
import core.stdc.stdio; // : sprintf; import core.stdc.stdio; // : sprintf;

2
std/meta.d
View file

@ -950,7 +950,7 @@ template Filter(alias pred, TList...)
// Used in template predicate unit tests below. // Used in template predicate unit tests below.
private version (unittest) private version(StdUnittest)
{ {
template testAlways(T...) template testAlways(T...)
{ {

2
std/numeric.d
View file

@ -26,7 +26,7 @@ import std.range.primitives;
import std.traits; import std.traits;
import std.typecons; import std.typecons;
version(unittest) version(StdUnittest)
{ {
import std.stdio; import std.stdio;
} }

4
std/parallelism.d
View file

@ -4103,7 +4103,7 @@ private struct RoundRobinBuffer(C1, C2)
} }
} }
version(unittest) version(StdUnittest)
{ {
// This was the only way I could get nested maps to work. // This was the only way I could get nested maps to work.
__gshared TaskPool poolInstance; __gshared TaskPool poolInstance;
@ -4770,7 +4770,7 @@ version(parallelismStressTest)
} }
} }
version(unittest) version(StdUnittest)
{ {
struct __S_12733 struct __S_12733
{ {

6
std/path.d
View file

@ -102,7 +102,7 @@ static import std.meta;
import std.range.primitives; import std.range.primitives;
import std.traits; import std.traits;
version (unittest) version(StdUnittest)
{ {
private: private:
struct TestAliasedString struct TestAliasedString
@ -4114,7 +4114,7 @@ string expandTilde(string inputPath) nothrow
} }
} }
version (unittest) version(StdUnittest)
{ {
/* Define a mock RandomAccessRange to use for unittesting. /* Define a mock RandomAccessRange to use for unittesting.
*/ */
@ -4145,7 +4145,7 @@ version (unittest)
static assert( isRandomAccessRange!(MockRange!(const(char))) ); static assert( isRandomAccessRange!(MockRange!(const(char))) );
} }
version (unittest) version(StdUnittest)
{ {
/* Define a mock BidirectionalRange to use for unittesting. /* Define a mock BidirectionalRange to use for unittesting.
*/ */

8
std/process.d
View file

@ -2731,7 +2731,7 @@ version (Windows) private immutable string shellSwitch = "/C";
// file. On Windows the file name gets a .cmd extension, while on // file. On Windows the file name gets a .cmd extension, while on
// POSIX its executable permission bit is set. The file is // POSIX its executable permission bit is set. The file is
// automatically deleted when the object goes out of scope. // automatically deleted when the object goes out of scope.
version (unittest) version(StdUnittest)
private struct TestScript private struct TestScript
{ {
this(string code) @system this(string code) @system
@ -2774,7 +2774,7 @@ private struct TestScript
string path; string path;
} }
version (unittest) version(StdUnittest)
private string uniqueTempPath() @safe private string uniqueTempPath() @safe
{ {
import std.file : tempDir; import std.file : tempDir;
@ -3073,7 +3073,7 @@ if (is(typeof(allocator(size_t.init)[0] = char.init)))
return buf; return buf;
} }
version(Windows) version(unittest) version(Windows) version(StdUnittest)
{ {
import core.stdc.stddef; import core.stdc.stddef;
import core.stdc.wchar_ : wcslen; import core.stdc.wchar_ : wcslen;
@ -3752,7 +3752,7 @@ version (Posix)
{ {
import core.sys.posix.stdlib; import core.sys.posix.stdlib;
} }
version (unittest) version(StdUnittest)
{ {
import std.conv, std.file, std.random; import std.conv, std.file, std.random;
} }

2
std/random.d
View file

@ -75,7 +75,7 @@ import std.traits;
static assert(is(typeof(u) == uint)); static assert(is(typeof(u) == uint));
} }
version(unittest) version(StdUnittest)
{ {
static import std.meta; static import std.meta;
package alias PseudoRngTypes = std.meta.AliasSeq!(MinstdRand0, MinstdRand, Mt19937, Xorshift32, Xorshift64, package alias PseudoRngTypes = std.meta.AliasSeq!(MinstdRand0, MinstdRand, Mt19937, Xorshift32, Xorshift64,

4
std/range/primitives.d
View file

@ -2121,7 +2121,7 @@ if (!isNarrowString!(T[]) && !is(T[] == void[]))
assert(a == [ 2, 3 ]); assert(a == [ 2, 3 ]);
} }
version(unittest) version(StdUnittest)
{ {
static assert(!is(typeof({ int[4] a; popFront(a); }))); static assert(!is(typeof({ int[4] a; popFront(a); })));
static assert(!is(typeof({ immutable int[] a; popFront(a); }))); static assert(!is(typeof({ immutable int[] a; popFront(a); })));
@ -2242,7 +2242,7 @@ if (!isNarrowString!(T[]) && !is(T[] == void[]))
assert(a == [ 1, 2 ]); assert(a == [ 1, 2 ]);
} }
version(unittest) version(StdUnittest)
{ {
static assert(!is(typeof({ immutable int[] a; popBack(a); }))); static assert(!is(typeof({ immutable int[] a; popBack(a); })));
static assert(!is(typeof({ int[4] a; popBack(a); }))); static assert(!is(typeof({ int[4] a; popBack(a); })));

2
std/socket.d
View file

@ -120,7 +120,7 @@ else
static assert(0); // No socket support yet. static assert(0); // No socket support yet.
} }
version(unittest) version(StdUnittest)
{ {
static assert(is(uint32_t == uint)); static assert(is(uint32_t == uint));
static assert(is(uint16_t == ushort)); static assert(is(uint16_t == ushort));

2
std/stdio.d
View file

@ -5273,7 +5273,7 @@ version(linux)
} }
} }
version(unittest) string testFilename(string file = __FILE__, size_t line = __LINE__) @safe version(StdUnittest) string testFilename(string file = __FILE__, size_t line = __LINE__) @safe
{ {
import std.conv : text; import std.conv : text;
import std.file : deleteme; import std.file : deleteme;

2
std/string.d
View file

@ -143,7 +143,7 @@ Source: $(PHOBOSSRC std/_string.d)
*/ */
module std.string; module std.string;
version (unittest) version(StdUnittest)
{ {
private: private:
struct TestAliasedString struct TestAliasedString

8
std/traits.d
View file

@ -334,7 +334,7 @@ template QualifierOf(T)
alias Qual7 = QualifierOf!( immutable int); static assert(is(Qual7!long == immutable long)); alias Qual7 = QualifierOf!( immutable int); static assert(is(Qual7!long == immutable long));
} }
version(unittest) version(StdUnittest)
{ {
alias TypeQualifierList = AliasSeq!(MutableOf, ConstOf, SharedOf, SharedConstOf, ImmutableOf); alias TypeQualifierList = AliasSeq!(MutableOf, ConstOf, SharedOf, SharedConstOf, ImmutableOf);
@ -482,7 +482,7 @@ template fullyQualifiedName(T...)
static assert(fullyQualifiedName!fullyQualifiedName == "std.traits.fullyQualifiedName"); static assert(fullyQualifiedName!fullyQualifiedName == "std.traits.fullyQualifiedName");
} }
version(unittest) version(StdUnittest)
{ {
// Used for both fqnType and fqnSym unittests // Used for both fqnType and fqnSym unittests
private struct QualifiedNameTests private struct QualifiedNameTests
@ -2238,7 +2238,7 @@ template SetFunctionAttributes(T, string linkage, uint attrs)
} }
} }
version (unittest) version(StdUnittest)
{ {
// Some function types to test. // Some function types to test.
int sc(scope int, ref int, out int, lazy int, int); int sc(scope int, ref int, out int, lazy int, int);
@ -7498,7 +7498,7 @@ template mangledName(sth...)
static assert(TL == AliasSeq!("i", "xi", "yi")); static assert(TL == AliasSeq!("i", "xi", "yi"));
} }
version(unittest) void freeFunc(string); version(StdUnittest) void freeFunc(string);
@safe unittest @safe unittest
{ {

4
std/typecons.d
View file

@ -4264,7 +4264,7 @@ private static:
alias Implementation = AutoImplement!(Issue17177, how, templateNot!isFinalFunction); alias Implementation = AutoImplement!(Issue17177, how, templateNot!isFinalFunction);
} }
version(unittest) version(StdUnittest)
{ {
// Issue 10647 // Issue 10647
// Add prefix "issue10647_" as a workaround for issue 1238 // Add prefix "issue10647_" as a workaround for issue 1238
@ -5235,7 +5235,7 @@ private template TypeMod(T)
enum TypeMod = cast(TypeModifier)(mod1 | mod2); enum TypeMod = cast(TypeModifier)(mod1 | mod2);
} }
version(unittest) version(StdUnittest)
{ {
private template UnittestFuncInfo(alias f) private template UnittestFuncInfo(alias f)
{ {

6
std/uni.d
View file

@ -719,7 +719,7 @@ debug(std_uni) import std.stdio; // writefln, writeln
private: private:
version (unittest) version(StdUnittest)
{ {
private: private:
struct TestAliasedString struct TestAliasedString
@ -3492,7 +3492,7 @@ private:
}} }}
} }
version(unittest) version(StdUnittest)
{ {
private alias AllSets = AliasSeq!(InversionList!GcPolicy, InversionList!ReallocPolicy); private alias AllSets = AliasSeq!(InversionList!GcPolicy, InversionList!ReallocPolicy);
} }
@ -7224,7 +7224,7 @@ if (isInputRange!Range && is(Unqual!(ElementType!Range) == dchar))
} }
// For testing non-forward-range input ranges // For testing non-forward-range input ranges
version(unittest) version(StdUnittest)
private static struct InputRangeString private static struct InputRangeString
{ {
private string s; private string s;

16
std/utf.d
View file

@ -1736,7 +1736,7 @@ unittest
} }
version(unittest) private void testDecode(R)(R range, version(StdUnittest) private void testDecode(R)(R range,
size_t index, size_t index,
dchar expectedChar, dchar expectedChar,
size_t expectedIndex, size_t expectedIndex,
@ -1765,7 +1765,7 @@ version(unittest) private void testDecode(R)(R range,
} }
} }
version(unittest) private void testDecodeFront(R)(ref R range, version(StdUnittest) private void testDecodeFront(R)(ref R range,
dchar expectedChar, dchar expectedChar,
size_t expectedNumCodeUnits, size_t expectedNumCodeUnits,
size_t line = __LINE__) size_t line = __LINE__)
@ -1790,7 +1790,7 @@ version(unittest) private void testDecodeFront(R)(ref R range,
} }
} }
version(unittest) private void testDecodeBack(R)(ref R range, version(StdUnittest) private void testDecodeBack(R)(ref R range,
dchar expectedChar, dchar expectedChar,
size_t expectedNumCodeUnits, size_t expectedNumCodeUnits,
size_t line = __LINE__) size_t line = __LINE__)
@ -1821,7 +1821,7 @@ version(unittest) private void testDecodeBack(R)(ref R range,
} }
} }
version(unittest) private void testAllDecode(R)(R range, version(StdUnittest) private void testAllDecode(R)(R range,
dchar expectedChar, dchar expectedChar,
size_t expectedIndex, size_t expectedIndex,
size_t line = __LINE__) size_t line = __LINE__)
@ -1835,7 +1835,7 @@ version(unittest) private void testAllDecode(R)(R range,
testDecodeFront(range, expectedChar, expectedIndex, line); testDecodeFront(range, expectedChar, expectedIndex, line);
} }
version(unittest) private void testBadDecode(R)(R range, size_t index, size_t line = __LINE__) version(StdUnittest) private void testBadDecode(R)(R range, size_t index, size_t line = __LINE__)
{ {
import core.exception : AssertError; import core.exception : AssertError;
import std.string : format; import std.string : format;
@ -1861,7 +1861,7 @@ version(unittest) private void testBadDecode(R)(R range, size_t index, size_t li
assertThrown!UTFException(decodeFront(range, index), null, __FILE__, line); assertThrown!UTFException(decodeFront(range, index), null, __FILE__, line);
} }
version(unittest) private void testBadDecodeBack(R)(R range, size_t line = __LINE__) version(StdUnittest) private void testBadDecodeBack(R)(R range, size_t line = __LINE__)
{ {
// This condition is to allow unit testing all `decode` functions together // This condition is to allow unit testing all `decode` functions together
static if (!isBidirectionalRange!R) static if (!isBidirectionalRange!R)
@ -3152,7 +3152,7 @@ if (isSomeChar!C)
// Ranges of code units for testing. // Ranges of code units for testing.
version(unittest) version(StdUnittest)
{ {
struct InputCU(C) struct InputCU(C)
{ {
@ -3906,7 +3906,7 @@ pure @safe nothrow @nogc unittest
foreach (c; s[].byDchar()) { } foreach (c; s[].byDchar()) { }
} }
version(unittest) version(StdUnittest)
int impureVariable; int impureVariable;
@system unittest @system unittest

2
std/windows/registry.d
View file

@ -81,7 +81,7 @@ class Win32Exception : WindowsException
@property int error() { return super.code; } @property int error() { return super.code; }
} }
version(unittest) import std.string : startsWith, endsWith; version(StdUnittest) import std.string : startsWith, endsWith;
@safe unittest @safe unittest
{ {