Implements part of P1614R2 "The Mothership has Landed"
Details
- Reviewers
Mordante mumbleskates huixie90 ldionne - Group Reviewers
Restricted Project - Commits
- rGb5a84ae09ab0: [libc++][spaceship] Implement `operator<=>` for `list`
Diff Detail
- Repository
- rG LLVM Github Monorepo
Unit Tests
Event Timeline
One thing I have thought about in our march towards finishing the lexically ordered containers is that we should be able to write a test utils header with one or more templated test functions that will work for most or all of these containers. We can possibly even add (in another header?) some helpful types like weakly ordered ints, types that compare with user orderings, etc. so we don't have to keep writing them over and over. This feels fairly sane to me but I don't know what the general vibe is on how DRY is too DRY for our test suite, and maybe it's better to just copy-paste those parts of the code each time.
libcxx/test/std/containers/sequences/list/compare.pass.cpp | ||
---|---|---|
47 ↗ | (On Diff #454251) | I recommend simply adding another file, such as compare.three_way.pass.cpp, that marks standard versions before 20 as unsupported, then simply does the test. Adding the parts of the test you want to conditionally execute with dozens of conditional directives is honestly too much noise with no real benefit. Don't forget the SFINAE tests! They should be pretty easy to do here as well. We should be able to test ordering behavior and SFINAE for all of the following:
All of these should be trivially reusable or easily copyable to the other container types. |
I'm very +1 for that direction of having a reusable header with common types and functions for this.
libcxx/include/list | ||
---|---|---|
2341 | the complete <compare> header is a standard-mandated include. See line 226 |
libcxx/test/std/containers/sequences/list/compare.pass.cpp | ||
---|---|---|
47 ↗ | (On Diff #454251) | I like the general idea! How about instead add a generic header file and make it possible to use the functions in there for the tests? Like we do in the test_comparisons.h header. That way the tests are at the expected location. WDYT? |
Introduce reusable test function
libcxx/test/std/containers/sequences/list/compare.pass.cpp | ||
---|---|---|
47 ↗ | (On Diff #454251) | Good idea. I introduced test_container_comparisons.h to contain those test helpers. In the future, we should also add a similar utility to test containers like std::map, std::set. The test functions are already written with std::vector in mind, i.e. they are constexpr and return true, so they can be used to test the constexpr-ness of std::vector.
How do I write such a user-ordering? |
libcxx/test/std/containers/sequences/list/compare.three_way.pass.cpp | ||
---|---|---|
22 | ||
libcxx/test/support/test_container_comparisons.h | ||
11 | Please add include guards. | |
15 | ||
62 | ||
79 | I think these tests can be extended a bit, it feels like they now use a small number of types. I also miss tests for <= to be true/false for certain values. |
Address review comments
libcxx/test/support/test_container_comparisons.h | ||
---|---|---|
79 | I am not sure I understand what you are asking for here
which additional types would you like to see? Afaict, the test case covers enough types such that we have all comparison categories covered?
testOrder calls testComparisonsComplete which also covers <=. Or am I misunderstanding your request for additional test coverage |
LGTM after the CI is green.
libcxx/test/support/test_container_comparisons.h | ||
---|---|---|
79 | I missed the types where <=> is synthesized, but it's there too. |
LGTM w/ green CI. Thanks!
libcxx/include/list | ||
---|---|---|
2345 | This should fix your CI issue with clang-tidy. |
libcxx/include/list | ||
---|---|---|
2345 | yes, I think so, too. Happy we have the ADL test cases nowadays! |
_LIBCPP_HIDE_FROM_ABI