This is an archive of the discontinued LLVM Phabricator instance.

Differential D92239

[libc++] Support simply `std::iterator_traits` in the iterator_traits test.
ClosedPublic

Authored by • Quuxplusone on Nov 27 2020, 10:52 AM.

Details

Reviewers
ldionne
rsmith
Group Reviewers
Restricted Project
Commits
rGc3e15b3c1c1c: [libc++] Support simply `std::iterator_traits` in the iterator_traits test.
Summary

This follows on from D56698. Somehow, on my local OSX 10.14.6 machine, the name printed in the error messages for this test is just std::, not std::__1:: or any other nested namespace. I copied the fix from commit 66e6e37447b183b1c8bac9330a4658530d2d49e6.

Diff Detail

Event Timeline

• Quuxplusone created this revision.Nov 27 2020, 10:52 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 27 2020, 10:52 AM
Herald added a subscriber: libcxx-commits. · View Herald Transcript
• Quuxplusone requested review of this revision.Nov 27 2020, 10:52 AM
Harbormaster completed remote builds in B80370: Diff 308090.Nov 27 2020, 12:16 PM
• Quuxplusone added a subscriber: vvereschaka.Nov 27 2020, 6:26 PM

Turns out this is a duplicate of @vvereschaka's D92142, but @ldionne, I'd still like to land this spelling of it, for consistency with https://github.com/llvm/llvm-project/commit/66e6e37447b183b1c8bac9330a4658530d2d49e6 .

ldionne accepted this revision.Dec 1 2020, 2:10 PM
This revision is now accepted and ready to land.Dec 1 2020, 2:10 PM
Closed by commit rGc3e15b3c1c1c: [libc++] Support simply `std::iterator_traits` in the iterator_traits test. (authored by • arthur.j.odwyer). · Explain WhyDec 1 2020, 7:14 PM
This revision was automatically updated to reflect the committed changes.
• arthur.j.odwyer added a commit: rGc3e15b3c1c1c: [libc++] Support simply `std::iterator_traits` in the iterator_traits test..

Revision Contents

PathSize
libcxx/
test/
std/
iterators/
iterator.primitives/
iterator.traits/
60 lines

Diff 308843

libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.fail.cpp

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Linesstruct NotAnIteratorNoCategory
typedef A& reference; typedef A& reference;
// typedef std::forward_iterator_tag iterator_category; // typedef std::forward_iterator_tag iterator_category;
}; };
int main(int, char**) int main(int, char**)
{ {
{ {
typedef std::iterator_traits<NotAnIteratorEmpty> T; typedef std::iterator_traits<NotAnIteratorEmpty> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
{ {
typedef std::iterator_traits<NotAnIteratorNoDifference> T; typedef std::iterator_traits<NotAnIteratorNoDifference> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
{ {
typedef std::iterator_traits<NotAnIteratorNoValue> T; typedef std::iterator_traits<NotAnIteratorNoValue> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
{ {
typedef std::iterator_traits<NotAnIteratorNoPointer> T; typedef std::iterator_traits<NotAnIteratorNoPointer> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
{ {
typedef std::iterator_traits<NotAnIteratorNoReference> T; typedef std::iterator_traits<NotAnIteratorNoReference> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
{ {
typedef std::iterator_traits<NotAnIteratorNoCategory> T; typedef std::iterator_traits<NotAnIteratorNoCategory> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}} typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std:{{.*}}:iterator_traits<{{.+}}>}}
} }
return 0; return 0;
} }