Skip to content

Commit 42e2caa

Browse files
0-v-0dlang-bot
authored andcommitted
Improve code readablitity in unittests
1 parent b5d9474 commit 42e2caa

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

std/format/spec.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,21 +681,21 @@ if (is(Unqual!Char == Char))
681681
auto fmt = "Number: %6.4e\nString: %s";
682682
auto f = FormatSpec!char(fmt);
683683

684-
assert(f.writeUpToNextSpec(a) == true);
684+
assert(f.writeUpToNextSpec(a));
685685

686686
assert(a.data == "Number: ");
687687
assert(f.trailing == "\nString: %s");
688688
assert(f.spec == 'e');
689689
assert(f.width == 6);
690690
assert(f.precision == 4);
691691

692-
assert(f.writeUpToNextSpec(a) == true);
692+
assert(f.writeUpToNextSpec(a));
693693

694694
assert(a.data == "Number: \nString: ");
695695
assert(f.trailing == "");
696696
assert(f.spec == 's');
697697

698-
assert(f.writeUpToNextSpec(a) == false);
698+
assert(!f.writeUpToNextSpec(a));
699699

700700
assert(a.data == "Number: \nString: ");
701701
}

std/range/package.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13539,10 +13539,10 @@ if (isInputRange!R && isIntegral!(ElementType!R))
1353913539
{
1354013540
size_t bitsNum = IntegralType.sizeof * 8;
1354113541

13542-
auto first = cast(IntegralType)(1);
13542+
auto first = IntegralType(1);
1354313543

1354413544
// 2 ^ (bitsNum - 1)
13545-
auto second = cast(IntegralType)(cast(IntegralType)(1) << (bitsNum - 2));
13545+
auto second = cast(IntegralType)(IntegralType(1) << (bitsNum - 2));
1354613546

1354713547
IntegralType[] a = [first, second];
1354813548
auto bw = Bitwise!(IntegralType[])(a);
@@ -13571,7 +13571,7 @@ if (isInputRange!R && isIntegral!(ElementType!R))
1357113571

1357213572
auto bw2 = bw[0 .. $ - 5];
1357313573
auto bw3 = bw2[];
13574-
assert(bw2.length == (bw.length - 5));
13574+
assert(bw2.length == bw.length - 5);
1357513575
assert(bw2.length == bw3.length);
1357613576
bw2.popFront();
1357713577
assert(bw2.length != bw3.length);

std/string.d

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6331,42 +6331,42 @@ if (isSomeString!S ||
63316331
assertCTFEable!(
63326332
{
63336333
// Test the isNumeric(in string) function
6334-
assert(isNumeric("1") == true );
6335-
assert(isNumeric("1.0") == true );
6336-
assert(isNumeric("1e-1") == true );
6337-
assert(isNumeric("12345xxxx890") == false );
6338-
assert(isNumeric("567L") == true );
6339-
assert(isNumeric("23UL") == true );
6340-
assert(isNumeric("-123..56f") == false );
6341-
assert(isNumeric("12.3.5.6") == false );
6342-
assert(isNumeric(" 12.356") == false );
6343-
assert(isNumeric("123 5.6") == false );
6344-
assert(isNumeric("1233E-1+1.0e-1i") == true );
6345-
6346-
assert(isNumeric("123.00E-5+1234.45E-12Li") == true);
6347-
assert(isNumeric("123.00e-5+1234.45E-12iL") == false);
6348-
assert(isNumeric("123.00e-5+1234.45e-12uL") == false);
6349-
assert(isNumeric("123.00E-5+1234.45e-12lu") == false);
6350-
6351-
assert(isNumeric("123fi") == true);
6352-
assert(isNumeric("123li") == true);
6353-
assert(isNumeric("--123L") == false);
6354-
assert(isNumeric("+123.5UL") == false);
6355-
assert(isNumeric("123f") == true);
6356-
assert(isNumeric("123.u") == false);
6334+
assert(isNumeric("1"));
6335+
assert(isNumeric("1.0"));
6336+
assert(isNumeric("1e-1"));
6337+
assert(!isNumeric("12345xxxx890"));
6338+
assert(isNumeric("567L"));
6339+
assert(isNumeric("23UL"));
6340+
assert(!isNumeric("-123..56f"));
6341+
assert(!isNumeric("12.3.5.6"));
6342+
assert(!isNumeric(" 12.356"));
6343+
assert(!isNumeric("123 5.6"));
6344+
assert(isNumeric("1233E-1+1.0e-1i"));
6345+
6346+
assert(isNumeric("123.00E-5+1234.45E-12Li"));
6347+
assert(!isNumeric("123.00e-5+1234.45E-12iL"));
6348+
assert(!isNumeric("123.00e-5+1234.45e-12uL"));
6349+
assert(!isNumeric("123.00E-5+1234.45e-12lu"));
6350+
6351+
assert(isNumeric("123fi"));
6352+
assert(isNumeric("123li"));
6353+
assert(!isNumeric("--123L"));
6354+
assert(!isNumeric("+123.5UL"));
6355+
assert(isNumeric("123f"));
6356+
assert(!isNumeric("123.u"));
63576357

63586358
// @@@BUG@@ to!string(float) is not CTFEable.
63596359
// Related: formatValue(T) if (is(FloatingPointTypeOf!T))
63606360
if (!__ctfe)
63616361
{
6362-
assert(isNumeric(to!string(real.nan)) == true);
6363-
assert(isNumeric(to!string(-real.infinity)) == true);
6362+
assert(isNumeric(to!string(real.nan)));
6363+
assert(isNumeric(to!string(-real.infinity)));
63646364
}
63656365

63666366
string s = "$250.99-";
6367-
assert(isNumeric(s[1 .. s.length - 2]) == true);
6368-
assert(isNumeric(s) == false);
6369-
assert(isNumeric(s[0 .. s.length - 1]) == false);
6367+
assert(isNumeric(s[1 .. $ - 2]));
6368+
assert(!isNumeric(s));
6369+
assert(!isNumeric(s[0 .. $ - 1]));
63706370
});
63716371

63726372
assert(!isNumeric("-"));

std/utf.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,8 +2528,8 @@ size_t encode(UseReplacementDchar useReplacementDchar = No.useReplacementDchar)(
25282528
encode(buf, '\u0000'); assert(buf[0] == '\u0000');
25292529
encode(buf, '\uD7FF'); assert(buf[0] == '\uD7FF');
25302530
encode(buf, '\uE000'); assert(buf[0] == '\uE000');
2531-
encode(buf, 0xFFFE ); assert(buf[0] == 0xFFFE);
2532-
encode(buf, 0xFFFF ); assert(buf[0] == 0xFFFF);
2531+
encode(buf, 0xFFFE); assert(buf[0] == 0xFFFE);
2532+
encode(buf, 0xFFFF); assert(buf[0] == 0xFFFF);
25332533
encode(buf, '\U0010FFFF'); assert(buf[0] == '\U0010FFFF');
25342534

25352535
assertThrown!UTFException(encode(buf, cast(dchar) 0xD800));
@@ -2749,8 +2749,8 @@ void encode(UseReplacementDchar useReplacementDchar = No.useReplacementDchar)(
27492749
encode(buf, '\u0000'); assert(buf[0] == '\u0000');
27502750
encode(buf, '\uD7FF'); assert(buf[1] == '\uD7FF');
27512751
encode(buf, '\uE000'); assert(buf[2] == '\uE000');
2752-
encode(buf, 0xFFFE ); assert(buf[3] == 0xFFFE);
2753-
encode(buf, 0xFFFF ); assert(buf[4] == 0xFFFF);
2752+
encode(buf, 0xFFFE); assert(buf[3] == 0xFFFE);
2753+
encode(buf, 0xFFFF); assert(buf[4] == 0xFFFF);
27542754
encode(buf, '\U0010FFFF'); assert(buf[5] == '\U0010FFFF');
27552755

27562756
assertThrown!UTFException(encode(buf, cast(dchar) 0xD800));

0 commit comments

Comments
 (0)