From 0a7e91329ff583fbde23cffd6f1127d47ed7a0e2 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Sun, 6 Jun 2021 08:05:49 +0100 Subject: [PATCH] Revert "Revert "AK: Always inline FlyString::view()"" This reverts commit f09216ac42bac9108e7f36ed2938c6f278f497e4. This was supposed to be a local test only, didn't mean to push it. :^) --- AK/FlyString.cpp | 5 ----- AK/FlyString.h | 3 +-- AK/StringImpl.h | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/AK/FlyString.cpp b/AK/FlyString.cpp index d1b31e1449..5ad1725d3a 100644 --- a/AK/FlyString.cpp +++ b/AK/FlyString.cpp @@ -115,11 +115,6 @@ FlyString FlyString::to_lowercase() const return String(*m_impl).to_lowercase(); } -StringView FlyString::view() const -{ - return { characters(), length() }; -} - bool FlyString::operator==(const String& other) const { if (m_impl == other.impl()) diff --git a/AK/FlyString.h b/AK/FlyString.h index 778d448b3d..2613167849 100644 --- a/AK/FlyString.h +++ b/AK/FlyString.h @@ -60,8 +60,7 @@ public: size_t length() const { return m_impl ? m_impl->length() : 0; } ALWAYS_INLINE u32 hash() const { return m_impl ? m_impl->existing_hash() : 0; } - - StringView view() const; + ALWAYS_INLINE StringView view() const { return m_impl ? m_impl->view() : StringView {}; } FlyString to_lowercase() const; diff --git a/AK/StringImpl.h b/AK/StringImpl.h index 316321ef5d..e84fa01432 100644 --- a/AK/StringImpl.h +++ b/AK/StringImpl.h @@ -43,6 +43,7 @@ public: const char* characters() const { return &m_inline_buffer[0]; } ALWAYS_INLINE ReadonlyBytes bytes() const { return { characters(), length() }; } + ALWAYS_INLINE StringView view() const { return { characters(), length() }; } const char& operator[](size_t i) const {