Skip to content

Commit 04f0a04

Browse files
authored
Fix old alias syntax (#10959)
I used [dscanner](dlang-community/D-Scanner#975). Needed as dlang/dmd#22244 was merged.
1 parent aa963e9 commit 04f0a04

2 files changed

Lines changed: 27 additions & 27 deletions

File tree

std/traits.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,8 +2246,8 @@ if (isCallable!func)
22462246
static assert(is( typeof(test) == FunctionTypeOf!test ));
22472247
static assert(is( typeof(test) == FunctionTypeOf!test_fp ));
22482248
static assert(is( typeof(test) == FunctionTypeOf!test_dg ));
2249-
alias int GetterType() @property;
2250-
alias int SetterType(int) @property;
2249+
alias GetterType = int() @property;
2250+
alias SetterType = int(int) @property;
22512251
static assert(is( FunctionTypeOf!propGet == GetterType ));
22522252
static assert(is( FunctionTypeOf!propSet == SetterType ));
22532253

std/typecons.d

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7586,12 +7586,12 @@ private template TypeMod(T)
75867586
}
75877587
alias methods = GetOverloadedMethods!A;
75887588

7589-
alias int F1();
7590-
alias @property int F2();
7591-
alias string F3();
7592-
alias nothrow @trusted uint F4();
7593-
alias int F5(Object);
7594-
alias bool F6(Object);
7589+
alias F1 = int();
7590+
alias F2 = @property int();
7591+
alias F3 = string();
7592+
alias F4 = nothrow @trusted uint();
7593+
alias F5 = int(Object);
7594+
alias F6 = bool(Object);
75957595
static assert(methods.length == 3 + 4);
75967596
static assert(__traits(identifier, methods[0]) == "draw" && is(typeof(&methods[0]) == F1*));
75977597
static assert(__traits(identifier, methods[1]) == "value" && is(typeof(&methods[1]) == F2*));
@@ -7675,49 +7675,49 @@ package template DerivedFunctionType(T...)
76757675
@safe unittest
76767676
{
76777677
// attribute covariance
7678-
alias int F1();
7678+
alias F1 = int();
76797679
static assert(is(DerivedFunctionType!(F1, F1) == F1));
7680-
alias int F2() pure nothrow;
7680+
alias F2 = int() pure nothrow;
76817681
static assert(is(DerivedFunctionType!(F1, F2) == F2));
7682-
alias int F3() @safe;
7683-
alias int F23() @safe pure nothrow;
7682+
alias F3 = int() @safe;
7683+
alias F23 = int() @safe pure nothrow;
76847684
static assert(is(DerivedFunctionType!(F2, F3) == F23));
76857685

76867686
// return type covariance
7687-
alias long F4();
7687+
alias F4 = long();
76887688
static assert(is(DerivedFunctionType!(F1, F4) == void));
76897689
class C {}
76907690
class D : C {}
7691-
alias C F5();
7692-
alias D F6();
7691+
alias F5 = C();
7692+
alias F6 = D();
76937693
static assert(is(DerivedFunctionType!(F5, F6) == F6));
7694-
alias typeof(null) F7();
7695-
alias int[] F8();
7696-
alias int* F9();
7694+
alias F7 = typeof(null)();
7695+
alias F8 = int[]();
7696+
alias F9 = int*();
76977697
static assert(is(DerivedFunctionType!(F5, F7) == F7));
76987698
static assert(is(DerivedFunctionType!(F7, F8) == void));
76997699
static assert(is(DerivedFunctionType!(F7, F9) == F7));
77007700

77017701
// variadic type equality
7702-
alias int F10(int);
7703-
alias int F11(int...);
7704-
alias int F12(int, ...);
7702+
alias F10 = int(int);
7703+
alias F11 = int(int...);
7704+
alias F12 = int(int, ...);
77057705
static assert(is(DerivedFunctionType!(F10, F11) == void));
77067706
static assert(is(DerivedFunctionType!(F10, F12) == void));
77077707
static assert(is(DerivedFunctionType!(F11, F12) == void));
77087708

77097709
// linkage equality
7710-
alias extern(C) int F13(int);
7711-
alias extern(D) int F14(int);
7712-
alias extern(Windows) int F15(int);
7710+
alias F13 = extern(C) int(int);
7711+
alias F14 = extern(D) int(int);
7712+
alias F15 = extern(Windows) int(int);
77137713
static assert(is(DerivedFunctionType!(F13, F14) == void));
77147714
static assert(is(DerivedFunctionType!(F13, F15) == void));
77157715
static assert(is(DerivedFunctionType!(F14, F15) == void));
77167716

77177717
// ref & @property equality
7718-
alias int F16(int);
7719-
alias ref int F17(int);
7720-
alias @property int F18(int);
7718+
alias F16 = int(int);
7719+
alias F17 = ref int(int);
7720+
alias F18 = @property int(int);
77217721
static assert(is(DerivedFunctionType!(F16, F17) == void));
77227722
static assert(is(DerivedFunctionType!(F16, F18) == void));
77237723
static assert(is(DerivedFunctionType!(F17, F18) == void));

0 commit comments

Comments
 (0)