mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 21:51:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert addition of StdUnittest

Browse source
This commit is contained in:
Jack Stouffer 2018-02-20 13:32:32 -05:00
parent d487bec91f
commit 663b5b9278
56 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
posix.mak
View file

@ -135,7 +135,7 @@ $(file > /tmp/TZDatabaseDirFile, ${TZ_DATABASE_DIR})
DFLAGS += -version=TZDatabaseDir -J/tmp/
endif
UDFLAGS=-unittest -version=StdUnittest
UDFLAGS=-unittest
# Set DOTOBJ and DOTEXE
ifeq (,$(findstring win,$(OS)))

2
std/algorithm/internal.d
View file

@ -14,7 +14,7 @@ package template algoFormat()
}
// Internal random array generators
version(StdUnittest)
version(unittest)
{
package enum size_t maxArraySize = 50;
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 (;;)
{
// Loop invariant
version(StdUnittest)
version(unittest)
{
import std.algorithm.searching : all;
assert(r[0 .. lo].all!(x => !lt(p, x)));
@ -3439,7 +3439,7 @@ done:
a.length / 2 + 1);
}
version(StdUnittest)
version(unittest)
private T[] randomArray(Flag!"exactSize" flag = No.exactSize, T = int)(
size_t maxSize = 1000,
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;
}
}
version(StdUnittest)
version(unittest)
{
import core.memory : UGC = GC;
static assert(!(blockAttribute!void & UGC.BlkAttr.NO_SCAN));
@ -569,7 +569,7 @@ private template nDimensions(T)
}
}
version(StdUnittest)
version(unittest)
{
static assert(nDimensions!(uint[]) == 1);
static assert(nDimensions!(float[][]) == 2);

2
std/ascii.d
View file

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

2
std/bitmanip.d
View file

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

4
std/concurrency.d
View file

@ -707,7 +707,7 @@ do
}
// Make sure receive() works with free functions as well.
version(StdUnittest)
version(unittest)
{
private void receiveFunction(int x) {}
}
@ -2427,7 +2427,7 @@ private
}
}
version(StdUnittest)
version(unittest)
{
import std.stdio;
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;
version(StdUnittest) debug = RBDoChecks;
version(unittest) debug = RBDoChecks;
//debug = RBDoChecks;
@ -745,7 +745,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
alias _less = binaryFun!less;
version(StdUnittest)
version(unittest)
{
static if (is(typeof(less) == string))
{

6
std/conv.d
View file

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

4
std/datetime/date.d
View file

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

2
std/datetime/interval.d
View file

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

8
std/datetime/systime.d
View file

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

2
std/datetime/timezone.d
View file

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

2
std/digest/crc.d
View file

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

2
std/digest/hmac.d
View file

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

2
std/digest/murmurhash.d
View file

@ -658,7 +658,7 @@ L_end:
}
}
version(StdUnittest)
version(unittest)
{
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(StdUnittest)
version(unittest)
{
import std.exception;
}

2
std/encoding.d
View file

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

2
std/exception.d
View file

@ -1771,7 +1771,7 @@ CommonType!(T1, T2) ifThrown(T1, T2)(lazy scope T1 expression, scope T2 delegate
static assert(!__traits(compiles, (new Object()).ifThrown(e=>1)));
}
version(StdUnittest) package
version(unittest) package
@property void assertCTFEable(alias dg)()
{
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.common;
import std.experimental.allocator.gc_allocator;
version(StdUnittest) import std.stdio;
version(unittest) import std.stdio;
// Turn this on for debugging
// debug = allocator_list;

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

@ -678,7 +678,7 @@ public:
tg.joinAll();
}
version(StdUnittest)
version(unittest)
{
static void testrw(void[] b) @nogc nothrow
{

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

@ -53,7 +53,7 @@ struct BitmappedBlock(size_t theBlockSize, uint theAlignment = platformAlignment
import std.typecons : Ternary;
import std.typecons : tuple, Tuple;
version(StdUnittest)
version(unittest)
@system unittest
{
import std.algorithm.comparison : max;

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

@ -29,7 +29,7 @@ struct FallbackAllocator(Primary, Fallback)
// Need both allocators to be stateless
// This is to avoid using default initialized stateful allocators
version(StdUnittest)
version(unittest)
static if (!stateSize!Primary && !stateSize!Fallback)
@system unittest
{

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

@ -120,7 +120,7 @@ struct FreeList(ParentAllocator,
_max = high;
}
version(StdUnittest)
version(unittest)
@system unittest
{
import std.experimental.allocator.common : chooseAtRuntime;

4
std/experimental/allocator/building_blocks/free_tree.d
View file

@ -335,7 +335,7 @@ struct FreeTree(ParentAllocator)
return true;
}
version(StdUnittest)
version(unittest)
@system unittest // test a few simple configurations
{
import std.experimental.allocator.gc_allocator;
@ -357,7 +357,7 @@ struct FreeTree(ParentAllocator)
assert(a.formatSizes == "(_)", a.formatSizes);
}
version(StdUnittest)
version(unittest)
@system unittest // build a complex free tree
{
import std.experimental.allocator.gc_allocator, std.range;

4
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;
//debug = KRRegion;
version(StdUnittest) import std.conv : text;
version(unittest) import std.conv : text;
debug(KRRegion) import std.stdio;
// KRRegion
@ -554,7 +554,7 @@ struct KRRegion(ParentAllocator = NullAllocator)
}
///
version(StdUnittest)
version(unittest)
@system unittest
{
import std.experimental.allocator.gc_allocator : GCAllocator;

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

@ -23,7 +23,7 @@ struct ScopedAllocator(ParentAllocator)
static if (!stateSize!ParentAllocator)
{
// This test is available only for stateless allocators
version(StdUnittest)
version(unittest)
@system unittest
{
testAllocator!(() => ScopedAllocator());

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;
}
version(StdUnittest)
version(unittest)
{
import std.experimental.allocator : RCIAllocator, RCISharedAllocator;

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

@ -12,7 +12,7 @@ import std.experimental.allocator.common;
*/
struct Mallocator
{
version(StdUnittest)
version(unittest)
@system unittest { testAllocator!(() => Mallocator.instance); }
/**
@ -354,7 +354,7 @@ struct AlignedMallocator
//...
}
version(StdUnittest) version(CRuntime_DigitalMars)
version(unittest) version(CRuntime_DigitalMars)
@nogc nothrow
size_t addr(ref void* ptr) { return cast(size_t) ptr; }

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

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

4
std/experimental/checkedint.d
View file

@ -2620,7 +2620,7 @@ if (isIntegral!T && T.sizeof >= 4)
testPow!ulong(3, 41);
}
version(StdUnittest) private struct CountOverflows
version(unittest) private struct CountOverflows
{
uint calls;
auto onOverflow(string op, Lhs)(Lhs lhs)
@ -2645,7 +2645,7 @@ version(StdUnittest) private struct CountOverflows
}
}
version(StdUnittest) private struct CountOpBinary
version(unittest) private struct CountOpBinary
{
uint calls;
auto hookOpBinary(string op, Lhs, Rhs)(Lhs lhs, Rhs rhs)

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

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

4
std/file.d
View file

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

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 ====================================== */
version(StdUnittest)
version(unittest)
void formatTest(T)(T val, string expected, size_t ln = __LINE__, string fn = __FILE__)
{
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);
}
version(StdUnittest)
version(unittest)
void formatTest(T)(string fmt, T val, string expected, size_t ln = __LINE__, string fn = __FILE__) @safe
{
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);
}
version(StdUnittest)
version(unittest)
void formatTest(T)(T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__)
{
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);
}
version(StdUnittest)
version(unittest)
void formatTest(T)(string fmt, T val, string[] expected, size_t ln = __LINE__, string fn = __FILE__) @safe
{
import core.exception : AssertError;
@ -4871,7 +4871,7 @@ here:
assert(a == "hello" && b == 124 && c == 34.5);
}
version(StdUnittest)
version(unittest)
void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = __FILE__, size_t ln = __LINE__)
{
import core.exception : AssertError;
@ -4913,7 +4913,7 @@ void formatReflectTest(T)(ref T val, string fmt, string formatted, string fn = _
input, fn, ln);
}
version(StdUnittest)
version(unittest)
void formatReflectTest(T)(ref T val, string fmt, string[] formatted, string fn = __FILE__, size_t ln = __LINE__)
{
import core.exception : AssertError;

2
std/internal/cstring.d
View file

@ -217,7 +217,7 @@ private:
To* _ptr;
size_t _length; // length of the string
version(StdUnittest)
version(unittest)
// the 'small string optimization'
{
// smaller size to trigger reallocations. Padding is to account for

2
std/math.d
View file

@ -175,7 +175,7 @@ else version (X86)
private alias haveSSE = core.cpuid.sse;
}
version(StdUnittest)
version(unittest)
{
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.
private version(StdUnittest)
private version(unittest)
{
template testAlways(T...)
{

2
std/net/curl.d
View file

@ -164,7 +164,7 @@ import std.encoding : EncodingScheme;
import std.traits : isSomeChar;
import std.typecons : Flag, Yes, No, Tuple;
version(StdUnittest)
version(unittest)
{
import std.socket : Socket;

4
std/net/isemail.d
View file

@ -1875,7 +1875,7 @@ bool isUpToFourHexChars(Char)(scope const(Char)[] s)
return true;
}
version(StdUnittest) @nogc nothrow pure @safe unittest
version(unittest) @nogc nothrow pure @safe unittest
{
assert(!isUpToFourHexChars("12345"));
assert(!isUpToFourHexChars("defg"));
@ -1945,7 +1945,7 @@ const(Char)[] matchIPSuffix(Char)(return const(Char)[] s) @nogc nothrow pure @sa
return s[start .. $];
}
version(StdUnittest) @nogc nothrow pure @safe unittest
version(unittest) @nogc nothrow pure @safe unittest
{
assert(matchIPSuffix("255.255.255.255") == "255.255.255.255");
assert(matchIPSuffix("babaev 176.16.0.1") == "176.16.0.1");

2
std/numeric.d
View file

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

4
std/parallelism.d
View file

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

6
std/path.d
View file

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

8
std/process.d
View file

@ -2734,7 +2734,7 @@ version (Windows) private immutable string shellSwitch = "/C";
// file. On Windows the file name gets a .cmd extension, while on
// POSIX its executable permission bit is set. The file is
// automatically deleted when the object goes out of scope.
version(StdUnittest)
version(unittest)
private struct TestScript
{
this(string code) @system
@ -2777,7 +2777,7 @@ private struct TestScript
string path;
}
version(StdUnittest)
version(unittest)
private string uniqueTempPath() @safe
{
import std.file : tempDir;
@ -3076,7 +3076,7 @@ if (is(typeof(allocator(size_t.init)[0] = char.init)))
return buf;
}
version(Windows) version(StdUnittest)
version(Windows) version(unittest)
{
import core.stdc.stddef;
import core.stdc.wchar_ : wcslen;
@ -3762,7 +3762,7 @@ version (Posix)
{
import core.sys.posix.stdlib;
}
version(StdUnittest)
version(unittest)
{
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));
}
version(StdUnittest)
version(unittest)
{
static import std.meta;
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 ]);
}
version(StdUnittest)
version(unittest)
{
static assert(!is(typeof({ int[4] 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 ]);
}
version(StdUnittest)
version(unittest)
{
static assert(!is(typeof({ immutable int[] 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.
}
version(StdUnittest)
version(unittest)
{
static assert(is(uint32_t == uint));
static assert(is(uint16_t == ushort));

2
std/stdio.d
View file

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

2
std/string.d
View file

@ -143,7 +143,7 @@ Source: $(PHOBOSSRC std/_string.d)
*/
module std.string;
version(StdUnittest)
version(unittest)
{
private:
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));
}
version(StdUnittest)
version(unittest)
{
alias TypeQualifierList = AliasSeq!(MutableOf, ConstOf, SharedOf, SharedConstOf, ImmutableOf);
@ -482,7 +482,7 @@ template fullyQualifiedName(T...)
static assert(fullyQualifiedName!fullyQualifiedName == "std.traits.fullyQualifiedName");
}
version(StdUnittest)
version(unittest)
{
// Used for both fqnType and fqnSym unittests
private struct QualifiedNameTests
@ -2238,7 +2238,7 @@ template SetFunctionAttributes(T, string linkage, uint attrs)
}
}
version(StdUnittest)
version(unittest)
{
// Some function types to test.
int sc(scope int, ref int, out int, lazy int, int);
@ -7499,7 +7499,7 @@ template mangledName(sth...)
static assert(TL == AliasSeq!("i", "xi", "yi"));
}
version(StdUnittest) void freeFunc(string);
version(unittest) void freeFunc(string);
@safe unittest
{

4
std/typecons.d
View file

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

6
std/uni.d
View file

@ -719,7 +719,7 @@ debug(std_uni) import std.stdio; // writefln, writeln
private:
version(StdUnittest)
version(unittest)
{
private:
struct TestAliasedString
@ -3492,7 +3492,7 @@ private:
}}
}
version(StdUnittest)
version(unittest)
{
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
version(StdUnittest)
version(unittest)
private static struct InputRangeString
{
private string s;

16
std/utf.d
View file

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

6
std/variant.d
View file

@ -705,7 +705,7 @@ public:
}
///
version(StdUnittest)
version(unittest)
@system unittest
{
Variant a;
@ -738,7 +738,7 @@ public:
}
///
version(StdUnittest)
version(unittest)
@system unittest
{
Variant a = 5;
@ -1130,7 +1130,7 @@ public:
}
///
version(StdUnittest)
version(unittest)
@system unittest
{
Variant a = new int[10];

2
std/windows/registry.d
View file

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

2
win32.mak
View file

@ -47,7 +47,7 @@ DFLAGS=-conf= -O -release -w -de -dip25 -I$(DRUNTIME)\import
## Flags for compiling unittests
UDFLAGS=-unittest -version=StdUnittest -conf= -O -w -dip25 -I$(DRUNTIME)\import
UDFLAGS=-unittest -conf= -O -w -dip25 -I$(DRUNTIME)\import
## C compiler

2
win64.mak
View file

@ -50,7 +50,7 @@ DFLAGS=-conf= -m$(MODEL) -O -release -w -de -dip25 -I$(DRUNTIME)\import
## Flags for compiling unittests
UDFLAGS=-conf= -g -m$(MODEL) -O -w -dip25 -I$(DRUNTIME)\import -version=StdUnittest
UDFLAGS=-conf= -g -m$(MODEL) -O -w -dip25 -I$(DRUNTIME)\import
## C compiler, linker, librarian