Skip to content

has basic_string call basic_string_view's assume-valid constructor #105863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2024
Merged

has basic_string call basic_string_view's assume-valid constructor #105863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bf49ee
has `basic_string` call `basic_string_view`'s assume-valid constructor
cjdb Aug 20, 2024
fd0fb62
updates formatting
cjdb Aug 21, 2024
c9bd38e
adds header
cjdb Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libcxx/include/string
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ public:
}

_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 operator __self_view() const _NOEXCEPT {
return __self_view(data(), size());
return __self_view(typename __self_view::__assume_valid(), data(), size());
}

_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS basic_string&
Expand Down Expand Up @@ -1822,7 +1822,7 @@ public:

#if _LIBCPP_STD_VER >= 20
constexpr _LIBCPP_HIDE_FROM_ABI bool starts_with(__self_view __sv) const noexcept {
return __self_view(data(), size()).starts_with(__sv);
return __self_view(typename __self_view::__assume_valid(), data(), size()).starts_with(__sv);
}

constexpr _LIBCPP_HIDE_FROM_ABI bool starts_with(value_type __c) const noexcept {
Expand All @@ -1834,7 +1834,7 @@ public:
}

constexpr _LIBCPP_HIDE_FROM_ABI bool ends_with(__self_view __sv) const noexcept {
return __self_view(data(), size()).ends_with(__sv);
return __self_view(typename __self_view::__assume_valid(), data(), size()).ends_with(__sv);
}

constexpr _LIBCPP_HIDE_FROM_ABI bool ends_with(value_type __c) const noexcept {
Expand All @@ -1848,15 +1848,15 @@ public:

#if _LIBCPP_STD_VER >= 23
constexpr _LIBCPP_HIDE_FROM_ABI bool contains(__self_view __sv) const noexcept {
return __self_view(data(), size()).contains(__sv);
return __self_view(typename __self_view::__assume_valid(), data(), size()).contains(__sv);
}

constexpr _LIBCPP_HIDE_FROM_ABI bool contains(value_type __c) const noexcept {
return __self_view(data(), size()).contains(__c);
return __self_view(typename __self_view::__assume_valid(), data(), size()).contains(__c);
}

constexpr _LIBCPP_HIDE_FROM_ABI bool contains(const value_type* __s) const {
return __self_view(data(), size()).contains(__s);
return __self_view(typename __self_view::__assume_valid(), data(), size()).contains(__s);
}
#endif

Expand Down
4 changes: 4 additions & 0 deletions libcxx/include/string_view
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ namespace std {
#include <__functional/hash.h>
#include <__functional/unary_function.h>
#include <__fwd/ostream.h>
#include <__fwd/string.h>
#include <__fwd/string_view.h>
#include <__iterator/bounded_iter.h>
#include <__iterator/concepts.h>
Expand Down Expand Up @@ -689,6 +690,9 @@ private:

const value_type* __data_;
size_type __size_;

template <class, class, class>
friend class basic_string;
};
_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_string_view);

Expand Down
Loading