Skip to content
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

Include <cmeow> instead of <meow.h>, Part2 #2852

Merged
merged 8 commits into from
Jul 21, 2022

Conversation

fsb4000
Copy link
Contributor

@fsb4000 fsb4000 commented Jul 10, 2022

While reviewing #2851 I found that tests/std/tests/Dev11_0836436_get_time/test.cpp includes #include <assert.h> and other .h files.
I recall that we already replaced <meow.h> to <cmeow>. I found the PR: #1405

There are still some places where we include <meow.h>:
tr1 tests
benchmarks\inc\xoshiro.hpp (because Written in 2018 by David Blackman and Sebastiano Vigna ([email protected]))
__msvc_all_public_headers.hpp
<cmeow>
tests\std\include\force_include.hpp (because Part of the LLVM Project)
tests with // LLVM SOURCES BEGIN (tests\std\tests\P0088R3_variant\test.cpp for example)

@fsb4000 fsb4000 requested a review from a team as a code owner July 10, 2022 10:04
Copy link
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't love that the namespaces are changed in this PR, given it's unnecessary AFAIK; additionally, I'm personally at least very much against using std:: to access C functions and types.

stl/src/xxxprec.hpp Outdated Show resolved Hide resolved
@StephanTLavavej StephanTLavavej added the enhancement Something can be improved label Jul 11, 2022
@fsb4000
Copy link
Contributor Author

fsb4000 commented Jul 13, 2022

clang-format aligning = default/= delete, no manual changes.

oops, I already updated clang to 14.
I will merge main and restart pipeline after the toolset update.

Copy link
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

Copy link
Member

@StephanTLavavej StephanTLavavej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this looks good. I've verified that everything that should be changed, is being changed with no missed occurrences, except for the exclusions as noted in the PR description.

As mentioned in a comment, I'm nervous about changing the header units test here - I think we should go back to including the UCRT headers, with added comments.

My last concern is that this is an extremely large PR in terms of the number of files being edited, so we should try to be extra clean about "nice to have" changes that are not strictly necessary for the central intent of the PR. There are a small number of namespace changes, and two of those files were missing changes, which is easily missed in such a large PR.

As much as I love using namespace std; in tests (I prefer for all tests in tests/std to use using-directives, unless they are one of the unusual ones that is specifically concerned with namespaces like the UDL test), and while we could add additional changes to patch the affected files, I would strongly prefer to remove these changes from the PR so that it's completely focused on the <cmeow> transformation - easily verified with git diff -U0 and grep filtering.

I've verified and will push changes. With this, I am confident that the PR shouldn't disrupt tests.

tests/std/tests/Dev08_563686_ostream/test.cpp Outdated Show resolved Hide resolved
tests/std/tests/P0476R2_bit_cast/test.cpp Outdated Show resolved Hide resolved
@StephanTLavavej
Copy link
Member

@strega-nil-ms FYI, I pushed changes after you approved.

@strega-nil-ms
Copy link
Contributor

@StephanTLavavej's changes LGTM! Thanks.

@StephanTLavavej StephanTLavavej self-assigned this Jul 19, 2022
@StephanTLavavej
Copy link
Member

I'm mirroring this to the MSVC-internal repo - please notify me if any further changes are pushed.

@StephanTLavavej
Copy link
Member

I've pushed a merge with main to resolve a simple merge conflict with #2125 in <charconv> (delete/modify). Accepted delete, as #2125 pre-emptively resolved this conflict in its moved code.

@StephanTLavavej StephanTLavavej merged commit 0f47cb7 into microsoft:main Jul 21, 2022
@StephanTLavavej
Copy link
Member

cthanks cfor cthis cconsistency cimprovement! 😹 🎉 🤪

@fsb4000 fsb4000 deleted the cmeow branch July 21, 2022 04:22
fsb4000 added a commit to fsb4000/STL that referenced this pull request Aug 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Something can be improved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants