-
Notifications
You must be signed in to change notification settings - Fork 13.4k
[libc++] fix flat_{multi}set insert_range #137462
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
huixie90
wants to merge
4
commits into
llvm:main
Choose a base branch
from
huixie90:hxie/fix_flat_set
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+83
−1
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
libcxx/test/libcxx/containers/container.adaptors/flat.multiset/insert_range.pass.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 | ||
// UNSUPPORTED: no-localization | ||
|
||
// <flat_set> | ||
|
||
// https://github.com/llvm/llvm-project/issues/136656 | ||
|
||
#include <flat_set> | ||
#include <ranges> | ||
#include <sstream> | ||
#include <vector> | ||
|
||
#include "MinSequenceContainer.h" | ||
#include "test_macros.h" | ||
|
||
void test() { | ||
MinSequenceContainer<int> v; | ||
std::flat_multiset s(v); | ||
std::istringstream ints("0 1 1 0"); | ||
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) | | ||
std::views::transform([](int i) { return i * i; }); | ||
static_assert( | ||
 { return requires { t.insert_range(r); }; }(v), | ||
"This test is to test the case where the underlying container does not provide insert_range"); | ||
s.insert_range(r); | ||
} | ||
|
||
int main(int, char**) { | ||
test(); | ||
|
||
return 0; | ||
} |
40 changes: 40 additions & 0 deletions
40
libcxx/test/libcxx/containers/container.adaptors/flat.set/insert_range.pass.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 | ||
// UNSUPPORTED: no-localization | ||
|
||
// <flat_set> | ||
|
||
// https://github.com/llvm/llvm-project/issues/136656 | ||
|
||
#include <flat_set> | ||
#include <ranges> | ||
#include <sstream> | ||
#include <vector> | ||
|
||
#include "MinSequenceContainer.h" | ||
#include "test_macros.h" | ||
|
||
void test() { | ||
MinSequenceContainer<int> v; | ||
std::flat_set s(v); | ||
std::istringstream ints("0 1 1 0"); | ||
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) | | ||
std::views::transform([](int i) { return i * i; }); | ||
static_assert( | ||
 { return requires { t.insert_range(r); }; }(v), | ||
"This test is to test the case where the underlying container does not provide insert_range"); | ||
s.insert_range(r); | ||
} | ||
|
||
int main(int, char**) { | ||
test(); | ||
|
||
return 0; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No (functional) change requested. Do we want to say the fallback branches are (pedantically) extensions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the other hand, it seems that the missing parts of
MinSequenceContainer
for C++23 sequence container requirements "silently" enforced ourflat_meow
to contain some extensions.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added static_assert in the test case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I guess these cases should be moved to the
libcxx/test/libcxx
subdirectory.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. moved the tests. leave this open for others to put their opinions on this "extension"