Skip to content

Commit 1adf633

Browse files
dlang-botdlang-bot
authored
Merge pull request #6107 from JackStouffer/stdunittest
Replaced version(unittest) blocks with version(StdUnittest) merged-on-behalf-of: Jack Stouffer <[email protected]>
2 parents 6b2eb9b + 18cbb29 commit 1adf633

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+79
-80
lines changed

‎std/algorithm/internal.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package template algoFormat()
1414
}
1515

1616
// Internal random array generators
17-
version(unittest)
17+
version(StdUnittest)
1818
{
1919
package enum size_t maxArraySize = 50;
2020
package enum size_t minArraySize = maxArraySize - 1;

‎std/algorithm/sorting.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ if (isRandomAccessRange!Range && hasLength!Range && hasSlicing!Range)
637637
for (;;)
638638
{
639639
// Loop invariant
640-
version(unittest)
640+
version(StdUnittest)
641641
{
642642
import std.algorithm.searching : all;
643643
assert(r[0 .. lo].all!(x => !lt(p, x)));
@@ -3439,7 +3439,7 @@ done:
34393439
a.length / 2 + 1);
34403440
}
34413441

3442-
version(unittest)
3442+
version(StdUnittest)
34433443
private T[] randomArray(Flag!"exactSize" flag = No.exactSize, T = int)(
34443444
size_t maxSize = 1000,
34453445
T minValue = 0, T maxValue = 255)

‎std/array.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ private template blockAttribute(T)
550550
enum blockAttribute = GC.BlkAttr.NO_SCAN;
551551
}
552552
}
553-
version(unittest)
553+
version(StdUnittest)
554554
{
555555
import core.memory : UGC = GC;
556556
static assert(!(blockAttribute!void & UGC.BlkAttr.NO_SCAN));
@@ -569,7 +569,7 @@ private template nDimensions(T)
569569
}
570570
}
571571

572-
version(unittest)
572+
version(StdUnittest)
573573
{
574574
static assert(nDimensions!(uint[]) == 1);
575575
static assert(nDimensions!(float[][]) == 2);

‎std/ascii.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(TR $(TD Enums) $(TD
5959
+/
6060
module std.ascii;
6161

62-
version (unittest)
62+
version(StdUnittest)
6363
{
6464
// FIXME: When dmd bug #314 is fixed, make these selective.
6565
import std.meta; // : AliasSeq;

‎std/bitmanip.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import std.range.primitives;
5858
public import std.system : Endian;
5959
import std.traits;
6060

61-
version(unittest)
61+
version(StdUnittest)
6262
{
6363
import std.stdio;
6464
}

‎std/concurrency.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2427,7 +2427,7 @@ private
24272427
}
24282428
}
24292429

2430-
version (unittest)
2430+
version(StdUnittest)
24312431
{
24322432
import std.stdio;
24332433
import std.typecons : tuple, Tuple;

‎std/container/rbtree.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import std.functional : binaryFun;
6161

6262
public import std.container.util;
6363

64-
version(unittest) debug = RBDoChecks;
64+
version(StdUnittest) debug = RBDoChecks;
6565

6666
//debug = RBDoChecks;
6767

@@ -745,7 +745,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
745745

746746
alias _less = binaryFun!less;
747747

748-
version(unittest)
748+
version(StdUnittest)
749749
{
750750
static if (is(typeof(less) == string))
751751
{

‎std/conv.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4882,7 +4882,7 @@ if (!is(T == class))
48824882
assert(u1.a == "hello");
48834883
}
48844884

4885-
version(unittest) private struct __conv_EmplaceTest
4885+
version(StdUnittest) private struct __conv_EmplaceTest
48864886
{
48874887
int i = 3;
48884888
this(int i)
@@ -4903,7 +4903,7 @@ version(unittest) private struct __conv_EmplaceTest
49034903
void opAssign();
49044904
}
49054905

4906-
version(unittest) private class __conv_EmplaceTestClass
4906+
version(StdUnittest) private class __conv_EmplaceTestClass
49074907
{
49084908
int i = 3;
49094909
this(int i) @nogc @safe pure nothrow
@@ -5323,7 +5323,7 @@ version(unittest) private class __conv_EmplaceTestClass
53235323
assert(s.i == 2);
53245324
}
53255325
}
5326-
version(unittest)
5326+
version(StdUnittest)
53275327
{
53285328
//Ambiguity
53295329
struct __std_conv_S

‎std/datetime/date.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import std.traits : isSomeString, Unqual;
1414
import std.typecons : Flag;
1515
import std.range.primitives : isOutputRange;
1616

17-
version(unittest) import std.exception : assertThrown;
17+
version(StdUnittest) import std.exception : assertThrown;
1818

1919
@safe unittest
2020
{
@@ -10272,7 +10272,7 @@ if (isSomeString!T)
1027210272
}
1027310273

1027410274

10275-
version(unittest)
10275+
version(StdUnittest)
1027610276
{
1027710277
// All of these helper arrays are sorted in ascending order.
1027810278
auto testYearsBC = [-1999, -1200, -600, -4, -1, 0];

‎std/datetime/interval.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import std.exception : enforce;
1414
import std.traits : isIntegral, Unqual;
1515
import std.typecons : Flag;
1616

17-
version(unittest) import std.exception : assertThrown;
17+
version(StdUnittest) import std.exception : assertThrown;
1818

1919

2020
/++

‎std/datetime/systime.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ else version(Posix)
3131
import core.sys.posix.sys.types : time_t;
3232
}
3333

34-
version(unittest)
34+
version(StdUnittest)
3535
{
3636
import core.exception : AssertError;
3737
import std.exception : assertThrown;
@@ -9699,7 +9699,7 @@ afterMon: stripAndCheckLen(value[3 .. value.length], "1200:00A".length);
96999699
assertThrown!DateTimeException(parseRFC822DateTime(badStr));
97009700
}
97019701

9702-
version(unittest) void testParse822(alias cr)(string str, SysTime expected, size_t line = __LINE__)
9702+
version(StdUnittest) void testParse822(alias cr)(string str, SysTime expected, size_t line = __LINE__)
97039703
{
97049704
import std.format : format;
97059705
auto value = cr(str);
@@ -9708,7 +9708,7 @@ version(unittest) void testParse822(alias cr)(string str, SysTime expected, size
97089708
throw new AssertError(format("wrong result. expected [%s], actual[%s]", expected, result), __FILE__, line);
97099709
}
97109710

9711-
version(unittest) void testBadParse822(alias cr)(string str, size_t line = __LINE__)
9711+
version(StdUnittest) void testBadParse822(alias cr)(string str, size_t line = __LINE__)
97129712
{
97139713
try
97149714
parseRFC822DateTime(cr(str));
@@ -10636,7 +10636,7 @@ if (isIntegral!T && isSigned!T) // The constraints on R were already covered by
1063610636
}
1063710637

1063810638

10639-
version(unittest)
10639+
version(StdUnittest)
1064010640
{
1064110641
// Variables to help in testing.
1064210642
Duration currLocalDiffFromUTC;

‎std/datetime/timezone.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ else version(Posix)
3333
import core.sys.posix.sys.types : time_t;
3434
}
3535

36-
version(unittest) import std.exception : assertThrown;
36+
version(StdUnittest) import std.exception : assertThrown;
3737

3838

3939
/++

‎std/digest/crc.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ module std.digest.crc;
6060

6161
public import std.digest;
6262

63-
version(unittest)
64-
import std.exception;
63+
version(StdUnittest) import std.exception;
6564

6665

6766
///

‎std/digest/hmac.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ if (isDigest!H)
287287
}
288288
}
289289

290-
version(unittest)
290+
version(StdUnittest)
291291
{
292292
import std.digest : toHexString, LetterCase;
293293
alias hex = toHexString!(LetterCase.lower);

‎std/digest/murmurhash.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ L_end:
658658
}
659659
}
660660

661-
version (unittest)
661+
version(StdUnittest)
662662
{
663663
import std.string : representation;
664664

‎std/digest/sha.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ else version(D_InlineAsm_X86_64)
118118
version(LittleEndian) import core.bitop : bswap;
119119

120120

121-
version(unittest)
121+
version(StdUnittest)
122122
{
123123
import std.exception;
124124
}

‎std/encoding.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3634,7 +3634,7 @@ class EncodingSchemeUtf32Native : EncodingScheme
36343634

36353635

36363636
// Helper functions
3637-
version(unittest)
3637+
version(StdUnittest)
36383638
{
36393639
void transcodeReverse(Src,Dst)(immutable(Src)[] s, out immutable(Dst)[] r)
36403640
{

‎std/exception.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,7 +1752,7 @@ CommonType!(T1, T2) ifThrown(T1, T2)(lazy scope T1 expression, scope T2 delegate
17521752
static assert(!__traits(compiles, (new Object()).ifThrown(e=>1)));
17531753
}
17541754

1755-
version(unittest) package
1755+
version(StdUnittest) package
17561756
@property void assertCTFEable(alias dg)()
17571757
{
17581758
static assert({ cast(void) dg(); return true; }());

‎std/experimental/allocator/building_blocks/allocator_list.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module std.experimental.allocator.building_blocks.allocator_list;
77
import std.experimental.allocator.building_blocks.null_allocator;
88
import std.experimental.allocator.common;
99
import std.experimental.allocator.gc_allocator;
10-
version(unittest) import std.stdio;
10+
version(StdUnittest) import std.stdio;
1111

1212
// Turn this on for debugging
1313
// debug = allocator_list;

‎std/experimental/allocator/building_blocks/ascending_page_allocator.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ else
657657
}
658658
}
659659

660-
version (StdUnittest)
660+
version(StdUnittest)
661661
{
662662
static void testrw(void[] b) @nogc nothrow
663663
{

‎std/experimental/allocator/building_blocks/kernighan_ritchie.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module std.experimental.allocator.building_blocks.kernighan_ritchie;
66
import std.experimental.allocator.building_blocks.null_allocator;
77

88
//debug = KRRegion;
9-
version(unittest) import std.conv : text;
9+
version(StdUnittest) import std.conv : text;
1010
debug(KRRegion) import std.stdio;
1111

1212
// KRRegion

‎std/experimental/allocator/common.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ Forwards each of the methods in `funs` (if defined) to `member`.
479479
return result;
480480
}
481481

482-
version(unittest)
482+
version(StdUnittest)
483483
{
484484
import std.experimental.allocator : RCIAllocator, RCISharedAllocator;
485485

‎std/experimental/allocator/mallocator.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ struct AlignedMallocator
354354
//...
355355
}
356356

357-
version(unittest) version(CRuntime_DigitalMars)
357+
version(StdUnittest) version(CRuntime_DigitalMars)
358358
@nogc nothrow
359359
size_t addr(ref void* ptr) { return cast(size_t) ptr; }
360360

‎std/experimental/allocator/package.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ if (isInputRange!R && !isInfinite!R)
19301930
assert(arr2.map!`a.val`.equal(iota(32, 204, 2)));
19311931
}
19321932

1933-
version(unittest)
1933+
version(StdUnittest)
19341934
{
19351935
private struct ForcedInputRange
19361936
{

‎std/experimental/logger/core.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ package class TestLogger : Logger
18461846
}
18471847
}
18481848

1849-
version(unittest) private void testFuncNames(Logger logger) @safe
1849+
version(StdUnittest) private void testFuncNames(Logger logger) @safe
18501850
{
18511851
string s = "I'm here";
18521852
logger.log(s);

‎std/file.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ else
132132
return _deleteme;
133133
}
134134

135-
version (unittest) private struct TestAliasedString
135+
version(StdUnittest) private struct TestAliasedString
136136
{
137137
string get() @safe @nogc pure nothrow { return _s; }
138138
alias get this;
@@ -2655,7 +2655,7 @@ version(Windows) string getcwd()
26552655
3. the buffer (lpBuffer) is not large enough: the required size of
26562656
the buffer, in characters, including the null-terminating character.
26572657
*/
2658-
version (StdUnittest)
2658+
version(StdUnittest)
26592659
enum BUF_SIZE = 10; // trigger reallocation code
26602660
else
26612661
enum BUF_SIZE = 4096; // enough for most common case

‎std/format.d

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4344,7 +4344,7 @@ private T getNth(string kind, alias Condition, T, A...)(uint index, A args)
43444344

43454345
/* ======================== Unit Tests ====================================== */
43464346

4347-
version(unittest)
4347+
version(StdUnittest)
43484348
void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __FILE__)
43494349
{
43504350
import core.exception : AssertError;
@@ -4358,7 +4358,7 @@ void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __F
43584358
text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln);
43594359
}
43604360

4361-
version(unittest)
4361+
version(StdUnittest)
43624362
void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, string fn = __FILE__) @safe
43634363
{
43644364
import core.exception : AssertError;
@@ -4371,7 +4371,7 @@ void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, str
43714371
text("expected = `", expected, "`, result = `", w.data, "`"), fn, ln);
43724372
}
43734373

4374-
version(unittest)
4374+
version(StdUnittest)
43754375
void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__)
43764376
{
43774377
import core.exception : AssertError;
@@ -4389,7 +4389,7 @@ void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = _
43894389
text("expected one of `", expected, "`, result = `", w.data, "`"), fn, ln);
43904390
}
43914391

4392-
version(unittest)
4392+
version(StdUnittest)
43934393
void formatTest(T)(string fmt, T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__) @safe
43944394
{
43954395
import core.exception : AssertError;
@@ -4871,7 +4871,7 @@ here:
48714871
assert(a == "hello" && b == 124 && c == 34.5);
48724872
}
48734873

4874-
version(unittest)
4874+
version(StdUnittest)
48754875
void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = __FILE__, size_t ln = __LINE__)
48764876
{
48774877
import core.exception : AssertError;
@@ -4913,7 +4913,7 @@ void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = _
49134913
input, fn, ln);
49144914
}
49154915

4916-
version(unittest)
4916+
version(StdUnittest)
49174917
void formatReflectTest(T)(ref T val, string fmt, string[] formatted, string fn = __FILE__, size_t ln = __LINE__)
49184918
{
49194919
import core.exception : AssertError;

‎std/internal/cstring.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private:
217217

218218
To* _ptr;
219219
size_t _length; // length of the string
220-
version (StdUnittest)
220+
version(StdUnittest)
221221
// the 'small string optimization'
222222
{
223223
// smaller size to trigger reallocations. Padding is to account for

‎std/math.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ else version (X86)
175175
private alias haveSSE = core.cpuid.sse;
176176
}
177177

178-
version(unittest)
178+
version(StdUnittest)
179179
{
180180
import core.stdc.stdio; // : sprintf;
181181

0 commit comments

Comments
 (0)