From 628af496b55997e0636dacd9788e99dcd0fd6253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Mon, 22 Mar 2021 10:35:46 +0100 Subject: [PATCH] Fix :web for non-class HTTPServerRequest. --- web/vibe/web/i18n.d | 4 ++-- web/vibe/web/web.d | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/vibe/web/i18n.d b/web/vibe/web/i18n.d index f3403ef281..6227b7dc52 100644 --- a/web/vibe/web/i18n.d +++ b/web/vibe/web/i18n.d @@ -341,7 +341,7 @@ package string determineLanguage(alias METHOD)(scope HTTPServerRequest req) unittest { // make sure that the custom determineLanguage is called static struct CTX { - static string determineLanguage(Object a) { return "test"; } + static string determineLanguage(HTTPServerRequest a) { return "test"; } } @translationContext!CTX static class Test { @@ -350,7 +350,7 @@ unittest { // make sure that the custom determineLanguage is called } } auto test = new Test; - assert(determineLanguage!(test.test)(null) == "test"); + assert(determineLanguage!(test.test)(HTTPServerRequest.init) == "test"); } unittest { // issue #1955 diff --git a/web/vibe/web/web.d b/web/vibe/web/web.d index 9bd00cfe32..7503f71489 100644 --- a/web/vibe/web/web.d +++ b/web/vibe/web/web.d @@ -891,7 +891,7 @@ private struct RequestContext { private RequestContext getRequestContext() @trusted nothrow { - assert(s_requestContext.req !is null, "Request context used outside of a web interface request!"); + assert(s_requestContext.req !is HTTPServerRequest.init, "Request context used outside of a web interface request!"); return s_requestContext; }