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.

Sign up for GitHub

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

Jump to bottom

meta: fix is_compatible/constructible traits #3020

Merged
merged 1 commit into from
Oct 7, 2021
Merged

meta: fix is_compatible/constructible traits #3020

merged 1 commit into from
Oct 7, 2021

Conversation

theodelrieu
Copy link
Contributor

@theodelrieu theodelrieu commented Sep 17, 2021 •
edited
Loading

(my previous PR was empty and got auto-closed, duh)

The previous version relied on the existence of an iterator member type.

As mentioned in comments, this is not the proper way to do it and causes issues with certain types (e.g. views from range-v3 which do not have such an alias).

Add a is_range trait that properly detects the return type of begin/end, and use it instead.

Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@theodelrieu
Copy link
Contributor Author

I ran make pretty but it seems that it made a lot of changes 🤔

@coveralls
Copy link

coveralls commented Sep 17, 2021 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling 7b2d591 on theodelrieu:fix/compatible_array_type into 0b345b2 on nlohmann:develop.

@theodelrieu theodelrieu force-pushed the fix/compatible_array_type branch 2 times, most recently from 28c2cea to 7fb7fc8 Compare September 17, 2021 09:20
@gregmarr
Copy link
Contributor

I ran make pretty but it seems that it made a lot of changes 🤔

Would it be worth doing that in a separate commit within the PR or even a separate PR?

@theodelrieu
Copy link
Contributor Author

Would it be worth doing that in a separate commit within the PR or even a separate PR?

I'll fix it.

@theodelrieu theodelrieu force-pushed the fix/compatible_array_type branch 3 times, most recently from be29787 to d58c4ac Compare September 20, 2021 07:58
nlohmann
nlohmann requested changes Sep 28, 2021
View reviewed changes
include/nlohmann/detail/macro_scope.hpp Outdated Show resolved Hide resolved
@theodelrieu
meta: fix is_compatible/constructible traits
7b2d591 
The previous version relied on the existence of an 'iterator' type.

As mentioned in comments, this is not the proper way to do it and
causes issues with certain types (e.g. views from range-v3).

Add a 'is_range' trait that properly detects the return type of
'begin'/'end', and use it in instead.
nlohmann
nlohmann approved these changes Oct 7, 2021
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann self-assigned this Oct 7, 2021
@nlohmann nlohmann added this to the Release 3.10.3 milestone Oct 7, 2021
@nlohmann nlohmann merged commit 80df5e8 into nlohmann:develop Oct 7, 2021
@nlohmann
Copy link
Owner

nlohmann commented Oct 7, 2021

Thanks a lot!

@theodelrieu theodelrieu deleted the fix/compatible_array_type branch October 8, 2021 14:24
theodelrieu added a commit to theodelrieu/json that referenced this pull request Oct 11, 2021
@theodelrieu
fix std::filesystem::path regression
df1e572 
Antiquated type traits performed an incorrect and insufficient check.

std::filesystem::path used to work by "chance" thanks to brittle
constraints, but the clean-up performed in nlohmann#3020 broke these.

Fixes nlohmann#3070
@theodelrieu theodelrieu mentioned this pull request Oct 11, 2021
Merged
4 tasks
theodelrieu added a commit to theodelrieu/json that referenced this pull request Oct 13, 2021
@theodelrieu
meta: rework is_compatible/is_constructible_string_type
a12ee7f 
These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in nlohmann#3020 broke them.
theodelrieu added a commit to theodelrieu/json that referenced this pull request Oct 13, 2021
@theodelrieu
meta: rework is_compatible/is_constructible_string_type
24a1479 
These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in nlohmann#3020 broke them.
theodelrieu added a commit to theodelrieu/json that referenced this pull request Oct 14, 2021
@theodelrieu
meta: rework is_compatible/is_constructible_string_type
f8e078e 
These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in nlohmann#3020 broke them.
nlohmann pushed a commit that referenced this pull request Oct 14, 2021
@theodelrieu
fix std::filesystem::path regression (#3073)
0e694b4 
* meta: rework is_compatible/is_constructible_string_type

These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in #3020 broke them.

* support std::filesystem::path

Fixes #3070
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregmarr gregmarr gregmarr left review comments

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: ⚡ improvement
Projects
None yet
Milestone
Release 3.10.3
Development

Successfully merging this pull request may close these issues.
4 participants
@theodelrieu @coveralls @gregmarr @nlohmann