From a88f9f92afa41c8d022291dfe92fe3ca8df76046 Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 3 Sep 2019 01:35:53 +0900 Subject: [PATCH 1/3] Remove dub hack in Travis config --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c08ea1..1a8a438 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,7 @@ branches: - master before_install: - # Use the dub-updating fork of the installer script until https://github.com/dlang/installer/pull/301 is merged - - wget https://raw.githubusercontent.com/wilzbach/installer-dub/master/script/install.sh -O ~/dlang/install.dub.sh + - wget https://dlang.org/install.sh -O ~/dlang/install.dub.sh - . $(bash ~/dlang/install.dub.sh -a dub) - dub --version From e7294bb9bd063266629331925d9e55edd973a2fd Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 20 Aug 2019 17:56:26 +0900 Subject: [PATCH 2/3] Clean up std.json deprecation --- source/vibe/core/args.d | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/vibe/core/args.d b/source/vibe/core/args.d index d0615d4..79bcb79 100755 --- a/source/vibe/core/args.d +++ b/source/vibe/core/args.d @@ -301,7 +301,13 @@ private void init() private T fromValue(T)(in JSONValue val) { import std.conv : to; - static if (is(T == bool)) return val.type == JSON_TYPE.TRUE; + static if (is(T == bool)) { + // JSONType.TRUE has been deprecated in v2.087.0 + static if (is(typeof(JSONType.true_))) + return val.type == JSONType.true_; + else + return val.type == JSONType.TRUE; + } else static if (is(T : long)) return val.integer.to!T; else static if (is(T : double)) return val.floating.to!T; else static if (is(T == string)) return val.str; From db994eaa802cf97011fcb6b11a69deb76fdab414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Tue, 17 Sep 2019 15:22:41 +0200 Subject: [PATCH 3/3] Fix compile error on old compiler versions --- source/vibe/core/args.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/vibe/core/args.d b/source/vibe/core/args.d index 79bcb79..309f185 100755 --- a/source/vibe/core/args.d +++ b/source/vibe/core/args.d @@ -306,7 +306,7 @@ private T fromValue(T)(in JSONValue val) static if (is(typeof(JSONType.true_))) return val.type == JSONType.true_; else - return val.type == JSONType.TRUE; + return val.type == JSON_TYPE.TRUE; } else static if (is(T : long)) return val.integer.to!T; else static if (is(T : double)) return val.floating.to!T;