From b46667639f703a31116647ba611e0b5772c38310 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Wed, 8 Feb 2023 22:07:52 -0500 Subject: [PATCH] LibHTTP: Make `HttpRequest` return its method name as a `StringView` --- Userland/Libraries/LibHTTP/HttpRequest.cpp | 24 +++++++++---------- Userland/Libraries/LibHTTP/HttpRequest.h | 4 ++-- .../Libraries/LibWeb/WebDriver/Client.cpp | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Userland/Libraries/LibHTTP/HttpRequest.cpp b/Userland/Libraries/LibHTTP/HttpRequest.cpp index b2ec457f29..0a5460727a 100644 --- a/Userland/Libraries/LibHTTP/HttpRequest.cpp +++ b/Userland/Libraries/LibHTTP/HttpRequest.cpp @@ -12,35 +12,35 @@ namespace HTTP { -DeprecatedString to_deprecated_string(HttpRequest::Method method) +StringView to_string_view(HttpRequest::Method method) { switch (method) { case HttpRequest::Method::GET: - return "GET"; + return "GET"sv; case HttpRequest::Method::HEAD: - return "HEAD"; + return "HEAD"sv; case HttpRequest::Method::POST: - return "POST"; + return "POST"sv; case HttpRequest::Method::DELETE: - return "DELETE"; + return "DELETE"sv; case HttpRequest::Method::PATCH: - return "PATCH"; + return "PATCH"sv; case HttpRequest::Method::OPTIONS: - return "OPTIONS"; + return "OPTIONS"sv; case HttpRequest::Method::TRACE: - return "TRACE"; + return "TRACE"sv; case HttpRequest::Method::CONNECT: - return "CONNECT"; + return "CONNECT"sv; case HttpRequest::Method::PUT: - return "PUT"; + return "PUT"sv; default: VERIFY_NOT_REACHED(); } } -DeprecatedString HttpRequest::method_name() const +StringView HttpRequest::method_name() const { - return to_deprecated_string(m_method); + return to_string_view(m_method); } ErrorOr HttpRequest::to_raw_request() const diff --git a/Userland/Libraries/LibHTTP/HttpRequest.h b/Userland/Libraries/LibHTTP/HttpRequest.h index fa66ee4788..2ad67797c0 100644 --- a/Userland/Libraries/LibHTTP/HttpRequest.h +++ b/Userland/Libraries/LibHTTP/HttpRequest.h @@ -79,7 +79,7 @@ public: ByteBuffer const& body() const { return m_body; } void set_body(ByteBuffer&& body) { m_body = move(body); } - DeprecatedString method_name() const; + StringView method_name() const; ErrorOr to_raw_request() const; void set_headers(HashMap const&); @@ -96,6 +96,6 @@ private: ByteBuffer m_body; }; -DeprecatedString to_deprecated_string(HttpRequest::Method); +StringView to_string_view(HttpRequest::Method); } diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.cpp b/Userland/Libraries/LibWeb/WebDriver/Client.cpp index f06c54a06c..ae6217e6c9 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.cpp +++ b/Userland/Libraries/LibWeb/WebDriver/Client.cpp @@ -110,7 +110,7 @@ static constexpr auto s_webdriver_endpoints = Array { // https://w3c.github.io/webdriver/#dfn-match-a-request static ErrorOr match_route(HTTP::HttpRequest const& request) { - dbgln_if(WEBDRIVER_DEBUG, "match_route({}, {})", HTTP::to_deprecated_string(request.method()), request.resource()); + dbgln_if(WEBDRIVER_DEBUG, "match_route({}, {})", HTTP::to_string_view(request.method()), request.resource()); auto request_path = request.resource().view(); Vector parameters; @@ -129,7 +129,7 @@ static ErrorOr match_route(HTTP::HttpRequest const& request }; for (auto const& route : s_webdriver_endpoints) { - dbgln_if(WEBDRIVER_DEBUG, "- Checking {} {}", HTTP::to_deprecated_string(route.method), route.path); + dbgln_if(WEBDRIVER_DEBUG, "- Checking {} {}", HTTP::to_string_view(route.method), route.path); if (route.method != request.method()) continue;