This is an archive of the discontinued LLVM Phabricator instance.

Differential D121054

[libc++] Remove <utility> includes
ClosedPublic

Authored by philnik on Mar 5 2022, 10:35 AM.

Details

Reviewers
ldionne
• Quuxplusone
Group Reviewers
Restricted Project
Commits
rG1458458b558d: [libc++] Remove <utility> includes

Diff Detail

Event Timeline

philnik created this revision.Mar 5 2022, 10:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 5 2022, 10:35 AM
Herald added a subscriber: arphaman. · View Herald Transcript
philnik requested review of this revision.Mar 5 2022, 10:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 5 2022, 10:35 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne requested changes to this revision.Mar 7 2022, 7:14 AM

This needs a release note!

This revision now requires changes to proceed.Mar 7 2022, 7:14 AM
philnik updated this revision to Diff 413473.Mar 7 2022, 7:32 AM
  • Update release note
  • export tuple_size from <ranges>
• Quuxplusone accepted this revision as: • Quuxplusone.Mar 7 2022, 7:38 AM

LGTM now FWIW.

libcxx/docs/ReleaseNotes.rst
62
Harbormaster completed remote builds in B152930: Diff 413473.Mar 7 2022, 10:28 AM
philnik added a comment.Mar 16 2022, 11:49 AM

ping @ldionne

ldionne accepted this revision.Mar 16 2022, 1:43 PM
This revision is now accepted and ready to land.Mar 16 2022, 1:43 PM
Closed by commit rG1458458b558d: [libc++] Remove <utility> includes (authored by philnik). · Explain WhyMar 16 2022, 4:12 PM
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rG1458458b558d: [libc++] Remove <utility> includes.

Revision Contents

PathSize
libcxx/
docs/
4 lines
include/
2 lines
2 lines
2 lines
2 lines
experimental/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
1 line
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines

Diff 416018

libcxx/docs/ReleaseNotes.rst

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines- The ``_LIBCPP_ABI_UNSTABLE`` macro has been removed in favour of setting
they were not supposed to set ``_LIBCPP_ABI_UNSTABLE`` manually, however we they were not supposed to set ``_LIBCPP_ABI_UNSTABLE`` manually, however we
still feel that it is worth mentioning in the release notes in case some users still feel that it is worth mentioning in the release notes in case some users
had been doing it. had been doing it.
- The header ``<experimental/filesystem>`` has been removed. Instead, use - The header ``<experimental/filesystem>`` has been removed. Instead, use
``<filesystem>`` header. The associated macro ``<filesystem>`` header. The associated macro
``_LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM`` has also been removed. ``_LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM`` has also been removed.
- Some libc++ headers no longer transitively include all of ``<algorithm>``and ``<chrono>``. - Some libc++ headers no longer transitively include all of ``<algorithm>``, ``<chrono>`` and ``<utility>``.
QuuxplusoneUnsubmitted
Not Done
ReplyInline Actions
``_LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM`` has also been removed.
- - Some libc++ headers no longer transitively include all of ``<algorithm>``, ``<chrono>`` and ``<utility>``.
+ - Some libc++ headers no longer transitively include all of ``<algorithm>``,
+ ``<chrono>`` and/or ``<utility>``.
If, after updating libc++, you see compiler errors related to missing declarations in
Quuxplusone:
If, after updating libc++, you see compiler errors related to missing declarations in If, after updating libc++, you see compiler errors related to missing declarations in
namespace ``std``, it might be because one of your source files now needs to namespace ``std``, it might be because one of your source files now needs to
``#include <algorithm>`` and/or ``#include <chrono>``. ``#include <algorithm>``, ``#include <chrono>`` and/or ``#include <utility>``.
- The integer distributions ``binomial_distribution``, ``discrete_distribution``, - The integer distributions ``binomial_distribution``, ``discrete_distribution``,
``geometric_distribution``, ``negative_binomial_distribution``, ``poisson_distribution``, ``geometric_distribution``, ``negative_binomial_distribution``, ``poisson_distribution``,
and ``uniform_int_distribution`` now conform to the Standard by rejecting and ``uniform_int_distribution`` now conform to the Standard by rejecting
template parameter types other than ``short``, ``int``, ``long``, ``long long``, template parameter types other than ``short``, ``int``, ``long``, ``long long``,
(as an extension) ``__int128_t``, and the unsigned versions thereof. (as an extension) ``__int128_t``, and the unsigned versions thereof.
In particular, ``uniform_int_distribution<int8_t>`` is no longer supported. In particular, ``uniform_int_distribution<int8_t>`` is no longer supported.
Show All 35 Lines

libcxx/include/__hash_table

Show All 18 Lines
#include <__functional/hash.h> #include <__functional/hash.h>
#include <__utility/swap.h> #include <__utility/swap.h>
#include <cmath> #include <cmath>
#include <initializer_list> #include <initializer_list>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <utility> // TODO: Remove this
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
▲ Show 20 Lines • Show All 2,768 Lines • Show Last 20 Lines

libcxx/include/__locale

Show All 13 Lines
#include <__config> #include <__config>
#include <cctype> #include <cctype>
#include <cstdint> #include <cstdint>
#include <locale.h> #include <locale.h>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <utility> // TODO: Remove this
#if defined(_LIBCPP_MSVCRT_LIKE) #if defined(_LIBCPP_MSVCRT_LIKE)
# include <__support/win32/locale_win32.h> # include <__support/win32/locale_win32.h>
# include <cstring> # include <cstring>
#elif defined(_AIX) || defined(__MVS__) #elif defined(_AIX) || defined(__MVS__)
# include <__support/ibm/xlocale.h> # include <__support/ibm/xlocale.h>
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
# include <__support/android/locale_bionic.h> # include <__support/android/locale_bionic.h>
#elif defined(__sun__) #elif defined(__sun__)
▲ Show 20 Lines • Show All 1,783 Lines • Show Last 20 Lines

libcxx/include/algorithm

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines
#include <cstring> #include <cstring>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
#include <__algorithm/adjacent_find.h> #include <__algorithm/adjacent_find.h>
#include <__algorithm/all_of.h> #include <__algorithm/all_of.h>
#include <__algorithm/any_of.h> #include <__algorithm/any_of.h>
#include <__algorithm/binary_search.h> #include <__algorithm/binary_search.h>
#include <__algorithm/clamp.h> #include <__algorithm/clamp.h>
#include <__algorithm/comp.h> #include <__algorithm/comp.h>
#include <__algorithm/comp_ref_type.h> #include <__algorithm/comp_ref_type.h>
#include <__algorithm/copy.h> #include <__algorithm/copy.h>
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines

libcxx/include/array

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
#include <__utility/integer_sequence.h> #include <__utility/integer_sequence.h>
#include <__utility/move.h> #include <__utility/move.h>
#include <__utility/unreachable.h> #include <__utility/unreachable.h>
#include <iterator> #include <iterator>
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
#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
template <class _Tp, size_t _Size> template <class _Tp, size_t _Size>
struct _LIBCPP_TEMPLATE_VIS array struct _LIBCPP_TEMPLATE_VIS array
▲ Show 20 Lines • Show All 391 Lines • Show Last 20 Lines

libcxx/include/experimental/memory_resource

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Lines
#include <experimental/__config> #include <experimental/__config>
#include <experimental/__memory> #include <experimental/__memory>
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <new> #include <new>
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include <utility> // TODO: Remove this
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines

libcxx/include/experimental/propagate_const

Show First 20 Lines • Show All 106 Lines • ▼ Show 20 Lines
*/ */
#include <__utility/move.h> #include <__utility/move.h>
#include <__utility/swap.h> #include <__utility/swap.h>
#include <experimental/__config> #include <experimental/__config>
#include <functional> #include <functional>
#include <type_traits> #include <type_traits>
#include <utility> // TODO: Remove this
#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
#if _LIBCPP_STD_VER > 11 #if _LIBCPP_STD_VER > 11
_LIBCPP_BEGIN_NAMESPACE_LFTS_V2 _LIBCPP_BEGIN_NAMESPACE_LFTS_V2
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines

libcxx/include/functional

Show First 20 Lines • Show All 521 Lines • ▼ Show 20 Lines
#include <concepts> #include <concepts>
#include <exception> #include <exception>
#include <memory> #include <memory>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <typeinfo> #include <typeinfo>
#include <version> #include <version>
#include <utility> // TODO: Remove this
#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
#endif // _LIBCPP_FUNCTIONAL #endif // _LIBCPP_FUNCTIONAL

libcxx/include/iterator

Show First 20 Lines • Show All 650 Lines • ▼ Show 20 Lines
#include <__memory/pointer_traits.h> #include <__memory/pointer_traits.h>
#include <compare> #include <compare>
#include <concepts> // Mandated by the Standard. #include <concepts> // Mandated by the Standard.
#include <cstddef> #include <cstddef>
#include <initializer_list> #include <initializer_list>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <__memory/allocator_arg_t.h> #include <__memory/allocator_arg_t.h>
Show All 10 Lines

libcxx/include/map

Show First 20 Lines • Show All 540 Lines • ▼ Show 20 Lines
#include <compare> #include <compare>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iterator> // __libcpp_erase_if_container #include <iterator> // __libcpp_erase_if_container
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
#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
template <class _Key, class _CP, class _Compare, template <class _Key, class _CP, class _Compare,
bool = is_empty<_Compare>::value && !__libcpp_is_final<_Compare>::value> bool = is_empty<_Compare>::value && !__libcpp_is_final<_Compare>::value>
▲ Show 20 Lines • Show All 1,783 Lines • Show Last 20 Lines

libcxx/include/memory

Show First 20 Lines • Show All 829 Lines • ▼ Show 20 Lines
#include <iterator> #include <iterator>
#include <new> #include <new>
#include <stdexcept> #include <stdexcept>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <typeinfo> #include <typeinfo>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines

libcxx/include/optional

Show First 20 Lines • Show All 166 Lines • ▼ Show 20 Lines
#include <compare> #include <compare>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <new> #include <new>
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__memory/allocator_arg_t.h> #include <__memory/allocator_arg_t.h>
#include <__memory/uses_allocator.h> #include <__memory/uses_allocator.h>
#include <typeinfo> #include <typeinfo>
#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 1,390 Lines • Show Last 20 Lines

libcxx/include/ranges

Show First 20 Lines • Show All 250 Lines • ▼ Show 20 Lines
#include <__ranges/reverse_view.h> #include <__ranges/reverse_view.h>
#include <__ranges/single_view.h> #include <__ranges/single_view.h>
#include <__ranges/size.h> #include <__ranges/size.h>
#include <__ranges/subrange.h> #include <__ranges/subrange.h>
#include <__ranges/take_view.h> #include <__ranges/take_view.h>
#include <__ranges/transform_view.h> #include <__ranges/transform_view.h>
#include <__ranges/view_interface.h> #include <__ranges/view_interface.h>
#include <__ranges/views.h> #include <__ranges/views.h>
#include <__tuple> // TODO: <ranges> has to export std::tuple_size. Replace this, once <tuple> is granularized.
#include <compare> // Required by the standard. #include <compare> // Required by the standard.
#include <initializer_list> // Required by the standard. #include <initializer_list> // Required by the standard.
#include <iterator> // Required by the standard. #include <iterator> // Required by the standard.
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#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
#endif // _LIBCPP_RANGES #endif // _LIBCPP_RANGES

libcxx/include/regex

Show First 20 Lines • Show All 773 Lines • ▼ Show 20 Lines
#include <initializer_list> #include <initializer_list>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <vector> #include <vector>
#include <version> #include <version>
#include <utility> // TODO: Remove this
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
▲ Show 20 Lines • Show All 6,046 Lines • Show Last 20 Lines

libcxx/include/string

Show First 20 Lines • Show All 537 Lines • ▼ Show 20 Lines
#include <iosfwd> #include <iosfwd>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <string_view> #include <string_view>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <new> #include <new>
▲ Show 20 Lines • Show All 3,945 Lines • Show Last 20 Lines

libcxx/include/tuple

Show First 20 Lines • Show All 177 Lines • ▼ Show 20 Lines
#include <__utility/pair.h> #include <__utility/pair.h>
#include <__utility/piecewise_construct.h> #include <__utility/piecewise_construct.h>
#include <__utility/swap.h> #include <__utility/swap.h>
#include <compare> #include <compare>
#include <cstddef> #include <cstddef>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <exception> #include <exception>
▲ Show 20 Lines • Show All 1,455 Lines • Show Last 20 Lines

libcxx/include/typeindex

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Lines
*/ */
#include <__config> #include <__config>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <compare> #include <compare>
#include <typeinfo> #include <typeinfo>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <__memory/allocator_arg_t.h> #include <__memory/allocator_arg_t.h>
#include <__memory/uses_allocator.h> #include <__memory/uses_allocator.h>
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines

libcxx/include/variant

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
#include <exception> #include <exception>
#include <initializer_list> #include <initializer_list>
#include <limits> #include <limits>
#include <new> #include <new>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <__memory/allocator_arg_t.h> #include <__memory/allocator_arg_t.h>
#include <__memory/uses_allocator.h> #include <__memory/uses_allocator.h>
#include <typeinfo> #include <typeinfo>
▲ Show 20 Lines • Show All 1,562 Lines • Show Last 20 Lines

libcxx/include/vector

Show First 20 Lines • Show All 296 Lines • ▼ Show 20 Lines
#include <initializer_list> #include <initializer_list>
#include <iosfwd> // for forward declaration of vector #include <iosfwd> // for forward declaration of vector
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#include <utility> // TODO: Remove this
// TODO: remove these headers // TODO: remove these headers
#include <__functional/binary_function.h> #include <__functional/binary_function.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__functional/operations.h> #include <__functional/operations.h>
#include <__functional/reference_wrapper.h> #include <__functional/reference_wrapper.h>
#include <__functional/unary_function.h> #include <__functional/unary_function.h>
#include <__functional/weak_result_type.h> #include <__functional/weak_result_type.h>
#include <typeinfo> #include <typeinfo>
▲ Show 20 Lines • Show All 3,001 Lines • Show Last 20 Lines