This is an archive of the discontinued LLVM Phabricator instance.

Differential D153828

[libc++] __iterator/readable_traits.h isn't standalone
ClosedPublic

Authored by iana on Jun 26 2023, 6:17 PM.

Details

Reviewers
ldionne
Mordante
Bigcheese
Group Reviewers
Restricted Project
Commits
rGd5ce68afdf65: [libc++] __iterator/readable_traits.h isn't standalone
Summary

__iterator/readable_traits.h can't be used by itself, intantiating iter_value_t requires __iterator/iterator_traits.h. readable_traits.h can't include iterator_traits.h though because iterator_traits.h requires readable_traits.h.

Move iter_value_t to __iterator/iterator_traits.h so that both headers can work standalone.

Diff Detail

Event Timeline

iana created this revision.Jun 26 2023, 6:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 26 2023, 6:17 PM
Herald added a subscriber: ributzka. · View Herald Transcript
iana requested review of this revision.Jun 26 2023, 6:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 26 2023, 6:17 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B241353: Diff 534808.Jun 26 2023, 8:10 PM
iana added a parent revision: D153214: [libc++] Remove the type_traits includes from limits and new.Jun 26 2023, 9:29 PM
iana added a child revision: D153211: [libc++][Modules] Make module exports consistent with header includes.
Mordante accepted this revision.Jun 27 2023, 10:18 AM

LGTM, thanks for the cleanup!

This revision is now accepted and ready to land.Jun 27 2023, 10:18 AM
iana edited the summary of this revision. (Show Details)Jun 27 2023, 10:33 AM
Closed by commit rGd5ce68afdf65: [libc++] __iterator/readable_traits.h isn't standalone (authored by iana). · Explain WhyJun 27 2023, 10:52 AM
This revision was automatically updated to reflect the committed changes.
iana added a commit: rGd5ce68afdf65: [libc++] __iterator/readable_traits.h isn't standalone.

Revision Contents

PathSize
libcxx/
include/
__algorithm/
1 line
__format/
2 lines
2 lines
2 lines
2 lines
2 lines
__iterator/
15 lines
11 lines
__memory/
2 lines
2 lines

Diff 534808

libcxx/include/__algorithm/ranges_unique_copy.h

Show All 15 Lines
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__functional/identity.h> #include <__functional/identity.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/ranges_operations.h> #include <__functional/ranges_operations.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/iterator_traits.h> #include <__iterator/iterator_traits.h>
#include <__iterator/projected.h> #include <__iterator/projected.h>
#include <__iterator/readable_traits.h>
#include <__ranges/access.h> #include <__ranges/access.h>
#include <__ranges/concepts.h> #include <__ranges/concepts.h>
#include <__ranges/dangling.h> #include <__ranges/dangling.h>
#include <__utility/forward.h> #include <__utility/forward.h>
#include <__utility/move.h> #include <__utility/move.h>
#include <__utility/pair.h> #include <__utility/pair.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines

libcxx/include/__format/format_functions.h

Show All 30 Lines
#include <__format/formatter_floating_point.h> #include <__format/formatter_floating_point.h>
#include <__format/formatter_integer.h> #include <__format/formatter_integer.h>
#include <__format/formatter_pointer.h> #include <__format/formatter_pointer.h>
#include <__format/formatter_string.h> #include <__format/formatter_string.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__iterator/back_insert_iterator.h> #include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/incrementable_traits.h> #include <__iterator/incrementable_traits.h>
#include <__iterator/readable_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <__variant/monostate.h> #include <__variant/monostate.h>
#include <array> #include <array>
#include <string> #include <string>
#include <string_view> #include <string_view>
#ifndef _LIBCPP_HAS_NO_LOCALIZATION #ifndef _LIBCPP_HAS_NO_LOCALIZATION
#include <locale> #include <locale>
#endif #endif
▲ Show 20 Lines • Show All 614 Lines • Show Last 20 Lines

libcxx/include/__format/format_string.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_FORMAT_STRING_H #ifndef _LIBCPP___FORMAT_FORMAT_STRING_H
#define _LIBCPP___FORMAT_FORMAT_STRING_H #define _LIBCPP___FORMAT_FORMAT_STRING_H
#include <__assert> #include <__assert>
#include <__config> #include <__config>
#include <__format/format_error.h> #include <__format/format_error.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/readable_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines

libcxx/include/__format/formatter_output.h

Show All 22 Lines
#include <__format/buffer.h> #include <__format/buffer.h>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/escaped_output_table.h> #include <__format/escaped_output_table.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__format/unicode.h> #include <__format/unicode.h>
#include <__iterator/back_insert_iterator.h> #include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/readable_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <__system_error/errc.h> #include <__system_error/errc.h>
#include <__type_traits/make_unsigned.h> #include <__type_traits/make_unsigned.h>
#include <__utility/move.h> #include <__utility/move.h>
#include <__utility/unreachable.h> #include <__utility/unreachable.h>
#include <cstddef> #include <cstddef>
#include <string> #include <string>
#include <string_view> #include <string_view>
▲ Show 20 Lines • Show All 558 Lines • Show Last 20 Lines

libcxx/include/__format/parser_std_format_spec.h

Show All 25 Lines
#include <__debug> #include <__debug>
#include <__format/format_arg.h> #include <__format/format_arg.h>
#include <__format/format_error.h> #include <__format/format_error.h>
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__format/format_string.h> #include <__format/format_string.h>
#include <__format/unicode.h> #include <__format/unicode.h>
#include <__format/width_estimation_table.h> #include <__format/width_estimation_table.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/readable_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <__memory/addressof.h> #include <__memory/addressof.h>
#include <__type_traits/common_type.h> #include <__type_traits/common_type.h>
#include <__type_traits/is_trivially_copyable.h> #include <__type_traits/is_trivially_copyable.h>
#include <__variant/monostate.h> #include <__variant/monostate.h>
#include <cstdint> #include <cstdint>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
▲ Show 20 Lines • Show All 977 Lines • Show Last 20 Lines

libcxx/include/__format/unicode.h

Show All 10 Lines
#define _LIBCPP___FORMAT_UNICODE_H #define _LIBCPP___FORMAT_UNICODE_H
#include <__assert> #include <__assert>
#include <__bit/countl.h> #include <__bit/countl.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__format/extended_grapheme_cluster_table.h> #include <__format/extended_grapheme_cluster_table.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/readable_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <__type_traits/make_unsigned.h> #include <__type_traits/make_unsigned.h>
#include <__utility/unreachable.h> #include <__utility/unreachable.h>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
▲ Show 20 Lines • Show All 456 Lines • Show Last 20 Lines

libcxx/include/__iterator/iterator_traits.h

Show First 20 Lines • Show All 528 Lines • ▼ Show 20 Lines
using __iterator_pointer_type = typename iterator_traits<_Iter>::pointer; using __iterator_pointer_type = typename iterator_traits<_Iter>::pointer;
template <class _Iter> template <class _Iter>
using __iter_diff_t = typename iterator_traits<_Iter>::difference_type; using __iter_diff_t = typename iterator_traits<_Iter>::difference_type;
template <class _Iter> template <class _Iter>
using __iter_reference = typename iterator_traits<_Iter>::reference; using __iter_reference = typename iterator_traits<_Iter>::reference;
#if _LIBCPP_STD_VER >= 20
// [readable.traits]
// Let `RI` be `remove_cvref_t<I>`. The type `iter_value_t<I>` denotes
// `indirectly_readable_traits<RI>::value_type` if `iterator_traits<RI>` names a specialization
// generated from the primary template, and `iterator_traits<RI>::value_type` otherwise.
// This has to be in this file and not readable_traits.h to break the include cycle between the two.
template <class _Ip>
using iter_value_t = typename conditional_t<__is_primary_template<iterator_traits<remove_cvref_t<_Ip> > >::value,
indirectly_readable_traits<remove_cvref_t<_Ip> >,
iterator_traits<remove_cvref_t<_Ip> > >::value_type;
#endif // _LIBCPP_STD_VER >= 20
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ITERATOR_ITERATOR_TRAITS_H #endif // _LIBCPP___ITERATOR_ITERATOR_TRAITS_H

libcxx/include/__iterator/readable_traits.h

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines
template<__has_member_value_type _Tp> template<__has_member_value_type _Tp>
requires __has_member_element_type<_Tp> && requires __has_member_element_type<_Tp> &&
same_as<remove_cv_t<typename _Tp::element_type>, same_as<remove_cv_t<typename _Tp::element_type>,
remove_cv_t<typename _Tp::value_type>> remove_cv_t<typename _Tp::value_type>>
struct indirectly_readable_traits<_Tp> struct indirectly_readable_traits<_Tp>
: __cond_value_type<typename _Tp::value_type> {}; : __cond_value_type<typename _Tp::value_type> {};
template <class>
struct iterator_traits;
// Let `RI` be `remove_cvref_t<I>`. The type `iter_value_t<I>` denotes
// `indirectly_readable_traits<RI>::value_type` if `iterator_traits<RI>` names a specialization
// generated from the primary template, and `iterator_traits<RI>::value_type` otherwise.
template <class _Ip>
using iter_value_t = typename conditional_t<__is_primary_template<iterator_traits<remove_cvref_t<_Ip> > >::value,
indirectly_readable_traits<remove_cvref_t<_Ip> >,
iterator_traits<remove_cvref_t<_Ip> > >::value_type;
#endif // _LIBCPP_STD_VER >= 20 #endif // _LIBCPP_STD_VER >= 20
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ITERATOR_READABLE_TRAITS_H #endif // _LIBCPP___ITERATOR_READABLE_TRAITS_H

libcxx/include/__memory/ranges_construct_at.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H #ifndef _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
#define _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H #define _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
#include <__concepts/destructible.h> #include <__concepts/destructible.h>
#include <__config> #include <__config>
#include <__iterator/incrementable_traits.h> #include <__iterator/incrementable_traits.h>
#include <__iterator/readable_traits.h> #include <__iterator/iterator_traits.h>
#include <__memory/concepts.h> #include <__memory/concepts.h>
#include <__memory/construct_at.h> #include <__memory/construct_at.h>
#include <__ranges/access.h> #include <__ranges/access.h>
#include <__ranges/concepts.h> #include <__ranges/concepts.h>
#include <__ranges/dangling.h> #include <__ranges/dangling.h>
#include <__utility/declval.h> #include <__utility/declval.h>
#include <__utility/forward.h> #include <__utility/forward.h>
#include <__utility/move.h> #include <__utility/move.h>
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines

libcxx/include/string_view

Show First 20 Lines • Show All 204 Lines • ▼ Show 20 Lines
#include <__algorithm/min.h> #include <__algorithm/min.h>
#include <__assert> // all public C++ headers provide the assertion handler #include <__assert> // all public C++ headers provide the assertion handler
#include <__config> #include <__config>
#include <__functional/hash.h> #include <__functional/hash.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__fwd/string_view.h> #include <__fwd/string_view.h>
#include <__iterator/bounded_iter.h> #include <__iterator/bounded_iter.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/readable_traits.h> #include <__iterator/iterator_traits.h>
#include <__iterator/reverse_iterator.h> #include <__iterator/reverse_iterator.h>
#include <__memory/pointer_traits.h> #include <__memory/pointer_traits.h>
#include <__ranges/concepts.h> #include <__ranges/concepts.h>
#include <__ranges/data.h> #include <__ranges/data.h>
#include <__ranges/enable_borrowed_range.h> #include <__ranges/enable_borrowed_range.h>
#include <__ranges/enable_view.h> #include <__ranges/enable_view.h>
#include <__ranges/size.h> #include <__ranges/size.h>
#include <__string/char_traits.h> #include <__string/char_traits.h>
▲ Show 20 Lines • Show All 834 Lines • Show Last 20 Lines