From edc32960832425e0a96da5bdf72872fa2f9f7628 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 12 Sep 2017 06:07:16 +0200 Subject: [PATCH] Drop support for dmd 2.073.2, remove deprecations --- .travis.yml | 1 - README.md | 1 - appveyor.yml | 6 ---- source/tanya/meta/metafunction.d | 3 -- source/tanya/meta/trait.d | 55 +++++++++++--------------------- 5 files changed, 19 insertions(+), 47 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84a483c..42b357d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ d: - dmd-2.076.0 - dmd-2.075.1 - dmd-2.074.1 - - dmd-2.073.2 env: matrix: diff --git a/README.md b/README.md index b2b3eae..66b1e18 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,6 @@ There are more containers in the `tanya.container` package. | 2.076.0 | | 2.075.1 | | 2.074.1 | -| 2.073.2 | ### Current status diff --git a/appveyor.yml b/appveyor.yml index 5c52adb..6324dc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,12 +21,6 @@ environment: - DC: dmd DVersion: 2.074.1 arch: x86 - - DC: dmd - DVersion: 2.073.2 - arch: x64 - - DC: dmd - DVersion: 2.073.2 - arch: x86 skip_tags: true diff --git a/source/tanya/meta/metafunction.d b/source/tanya/meta/metafunction.d index 0b7e4e0..a0a62ac 100644 --- a/source/tanya/meta/metafunction.d +++ b/source/tanya/meta/metafunction.d @@ -1094,9 +1094,6 @@ if (isTemplate!cmp) } } -deprecated("Use tanya.meta.metafunction.isSorted instead") -alias staticIsSorted = isSorted; - /// pure nothrow @safe @nogc unittest { diff --git a/source/tanya/meta/trait.d b/source/tanya/meta/trait.d index d428ddd..d9cd781 100644 --- a/source/tanya/meta/trait.d +++ b/source/tanya/meta/trait.d @@ -964,41 +964,6 @@ pure nothrow @safe @nogc unittest static assert(!isAggregateType!void); } -/** - * Determines whether $(D_PARAM T) is some type. - * - * Params: - * T = A symbol. - * - * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a type, - * $(D_KEYWORD false) otherwise. - */ -deprecated("Use isTypeTuple instead") -enum bool isType(alias T) = is(T); - -/// Ditto. -deprecated("Use isTypeTuple instead") -enum bool isType(T) = true; - -/// -pure nothrow @safe @nogc unittest -{ - class C; - enum E : bool; - union U; - struct T(); - - static assert(isType!C); - static assert(isType!E); - static assert(isType!U); - static assert(isType!void); - static assert(isType!int); - static assert(!isType!T); - static assert(isType!(T!())); - static assert(!isType!5); - static assert(!isType!(tanya.meta.trait)); -} - /** * Determines whether $(D_PARAM T) is a narrow string, i.e. consists of * $(D_KEYWORD char) or $(D_KEYWORD wchar). @@ -1282,6 +1247,9 @@ pure nothrow @safe @nogc unittest static assert(!isAbstractClass!E); } +private enum bool isType(alias T) = is(T); +private enum bool isType(T) = true; + /** * Determines whether $(D_PARAM Args) contains only types. * @@ -1300,6 +1268,21 @@ pure nothrow @safe @nogc unittest static assert(isTypeTuple!()); static assert(!isTypeTuple!(int, 8, Object)); static assert(!isTypeTuple!(5, 8, 2)); + + class C; + enum E : bool; + union U; + struct T(); + + static assert(isTypeTuple!C); + static assert(isTypeTuple!E); + static assert(isTypeTuple!U); + static assert(isTypeTuple!void); + static assert(isTypeTuple!int); + static assert(!isTypeTuple!T); + static assert(isTypeTuple!(T!())); + static assert(!isTypeTuple!5); + static assert(!isTypeTuple!(tanya.meta.trait)); } /** @@ -2982,7 +2965,7 @@ template getUDAs(alias symbol, alias attr) { alias FindUDA = AliasSeq!(); } - else static if ((isType!attr && is(TypeOf!(T[0]) == attr)) + else static if ((isTypeTuple!attr && is(TypeOf!(T[0]) == attr)) || (is(typeof(T[0] == attr)) && (T[0] == attr)) || isInstanceOf!(attr, TypeOf!(T[0]))) {