This is an archive of the discontinued LLVM Phabricator instance.

Differential D91136

[4/N] [libcxx] Reorder the two u8path functions, to make the following diff more readable. NFC.
ClosedPublic

Authored by mstorsjo on Nov 10 2020, 1:30 AM.

Details

Reviewers
EricWF
curdeius
ldionne
Group Reviewers
Restricted Project
Commits
rG48c6500b5bfa: [libcxx] Reorder the two u8path functions, to make the following diff more…

Diff Detail

Event Timeline

mstorsjo created this revision.Nov 10 2020, 1:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 10 2020, 1:30 AM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
mstorsjo requested review of this revision.Nov 10 2020, 1:30 AM
mstorsjo added a parent revision: D91135: [3/N] [libcxx] Make filesystem::path::value_type wchar_t on windows.
Harbormaster completed remote builds in B78250: Diff 304088.Nov 10 2020, 1:31 AM
mstorsjo added a child revision: D91137: [5/N] [libcxx] Convert paths to/from the right narrow code page for narrow strings on windows.Nov 10 2020, 1:35 AM
mstorsjo added a reviewer: EricWF.Nov 21 2020, 6:17 AM
curdeius accepted this revision.Dec 9 2020, 12:50 PM
curdeius added a subscriber: curdeius.

LGTM

mstorsjo updated this revision to Diff 311014.Dec 10 2020, 1:51 PM

Rebased

mstorsjo updated this revision to Diff 311015.Dec 10 2020, 1:53 PM
mstorsjo set the repository for this revision to rG LLVM Github Monorepo.

Rebased, readd the repository

Harbormaster completed remote builds in B81909: Diff 311015.Dec 10 2020, 2:46 PM
ldionne accepted this revision.Dec 14 2020, 3:19 PM
This revision is now accepted and ready to land.Dec 14 2020, 3:19 PM
mstorsjo updated this revision to Diff 312437.Dec 17 2020, 3:51 AM
mstorsjo removed rG LLVM Github Monorepo as the repository for this revision.
mstorsjo set the repository for this revision to rG LLVM Github Monorepo.

Rebased on top of D93283.

Harbormaster completed remote builds in B82766: Diff 312437.Dec 17 2020, 6:11 AM
Closed by commit rG48c6500b5bfa: [libcxx] Reorder the two u8path functions, to make the following diff more… (authored by mstorsjo). · Explain WhyDec 18 2020, 1:25 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG48c6500b5bfa: [libcxx] Reorder the two u8path functions, to make the following diff more….

Revision Contents

PathSize
libcxx/
include/
28 lines

Diff 312716

libcxx/include/filesystem

Show First 20 Lines • Show All 1,356 Lines • ▼ Show 20 Lines
inline _LIBCPP_INLINE_VISIBILITY void swap(path& __lhs, path& __rhs) noexcept { inline _LIBCPP_INLINE_VISIBILITY void swap(path& __lhs, path& __rhs) noexcept {
__lhs.swap(__rhs); __lhs.swap(__rhs);
} }
_LIBCPP_FUNC_VIS _LIBCPP_FUNC_VIS
size_t hash_value(const path& __p) noexcept; size_t hash_value(const path& __p) noexcept;
template <class _Source>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
typename enable_if<__is_pathable<_Source>::value, path>::type
u8path(const _Source& __s) {
static_assert(
#ifndef _LIBCPP_NO_HAS_CHAR8_T
is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value ||
#endif
is_same<typename __is_pathable<_Source>::__char_type, char>::value,
"u8path(Source const&) requires Source have a character type of type "
"'char' or 'char8_t'");
return path(__s);
}
template <class _InputIt> template <class _InputIt>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
typename enable_if<__is_pathable<_InputIt>::value, path>::type typename enable_if<__is_pathable<_InputIt>::value, path>::type
u8path(_InputIt __f, _InputIt __l) { u8path(_InputIt __f, _InputIt __l) {
static_assert( static_assert(
#ifndef _LIBCPP_NO_HAS_CHAR8_T #ifndef _LIBCPP_NO_HAS_CHAR8_T
is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value || is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
#endif #endif
is_same<typename __is_pathable<_InputIt>::__char_type, char>::value, is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
"u8path(Iter, Iter) requires Iter have a value_type of type 'char'" "u8path(Iter, Iter) requires Iter have a value_type of type 'char'"
" or 'char8_t'"); " or 'char8_t'");
return path(__f, __l); return path(__f, __l);
} }
template <class _Source>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
typename enable_if<__is_pathable<_Source>::value, path>::type
u8path(const _Source& __s) {
static_assert(
#ifndef _LIBCPP_NO_HAS_CHAR8_T
is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value ||
#endif
is_same<typename __is_pathable<_Source>::__char_type, char>::value,
"u8path(Source const&) requires Source have a character type of type "
"'char' or 'char8_t'");
return path(__s);
}
class _LIBCPP_TYPE_VIS path::iterator { class _LIBCPP_TYPE_VIS path::iterator {
public: public:
enum _ParserState : unsigned char { enum _ParserState : unsigned char {
_Singular, _Singular,
_BeforeBegin, _BeforeBegin,
_InRootName, _InRootName,
_InRootDir, _InRootDir,
_InFilenames, _InFilenames,
▲ Show 20 Lines • Show All 1,421 Lines • Show Last 20 Lines