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

String view2 #3237

Closed
wants to merge 47 commits into from
Closed

String view2 #3237

wants to merge 47 commits into from

Conversation

nlohmann
Copy link
Owner

@nlohmann nlohmann commented Jan 2, 2022

This PR tries to get a green CI for the original string_view PR.

@nlohmann
⚗️ at() for std::string_view #1529
e3c2d55
@nlohmann
🐛 add missing negation
edd2462
@nlohmann
🐛 add missing negation
d770517
@nlohmann
⚗️ add more std::string_view support
7742859
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
6019b5d 
…g_view
@nlohmann
♻️ unify types for object keys
5ea15c4
@nlohmann
📝 update documentation
ba97e9f
@nlohmann
✅ add tests for count() and contains()
360f21e
@nlohmann
💚 fix build
2f2c759
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
16fb0cb 
…g_view
@nlohmann
🚧 add overload for erase(std::string_view)
d01a6a4
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
4a78689 
…g_view
@nlohmann
🚧 implement operator[] for string_view
d42f37a
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
47c7e2c 
…g_view
@nlohmann
👌 apply review comments
268600e
@nlohmann
💡 update documentation
203b53d
@nlohmann
💚 fix build
5c1c79b
@nlohmann
👌 apply review comments
0ff33d0
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
f359d74 
…g_view
@nlohmann
♻️ clean up
69d74d4
@nlohmann
⚗️ exclude iterators from KeyType
418fdba
@nlohmann
⚗️ add forgotten forward
02b36e9
@nlohmann
👌 implement some review comments
ea4891f
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
4a16e55 
…g_view

� Conflicts:
�	include/nlohmann/detail/meta/type_traits.hpp
�	single_include/nlohmann/json.hpp
@nlohmann
🔀 merge develop
0818554
@nlohmann
📝 document less-than comparability
12c0bc4
@nlohmann
👌 apply review comments
eb0f8d7
@nlohmann
👌 apply review comments
aaef7cd
@nlohmann
👌 apply review comments
b27938a
@nlohmann
🚧 fix return type
80cb607
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
8ba8c43 
…g_view
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
575c28c 
…g_view
@nlohmann
👌 fix code according to review comments
1bd8a10
@nlohmann
👌 fix code according to review comments
3212700
@nlohmann
⚗️ add fix for Clang 3.5
86dd665
@nlohmann
⏪ undo experimental fix for Clang 3.5
5f39b09
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
d15ad85 
…g_view

� Conflicts:
�	include/nlohmann/detail/meta/type_traits.hpp
�	include/nlohmann/json.hpp
�	single_include/nlohmann/json.hpp
@nlohmann
🔀 merge develop
8b9e297
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
11eab8a 
…g_view

� Conflicts:
�	include/nlohmann/json.hpp
�	single_include/nlohmann/json.hpp
@nlohmann
🔀 update from develop
9b838a0
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
76109db 
…g_view
@nlohmann
💚 add fix from Minipeps@dd4eef3
e86d8b9
@nlohmann
💚 add fix from Minipeps@dd4eef3
cf06ba8
@nlohmann
📝 overwork documentation
25ca594
@nlohmann
✅ improve coverage
5379b5d
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into strin…
4703dd5 
…g_view2

� Conflicts:
�	doc/mkdocs/docs/api/basic_json/contains.md
�	doc/mkdocs/docs/api/basic_json/find.md
�	include/nlohmann/json.hpp
�	single_include/nlohmann/json.hpp
�	test/src/unit-regression2.cpp
@nlohmann
🔀 merge develop branch
7254b1f
@nlohmann nlohmann mentioned this pull request Jan 2, 2022
Closed
@nlohmann nlohmann marked this pull request as draft January 2, 2022 15:34
@nlohmann nlohmann added the state: help needed the issue needs help to proceed label Jan 2, 2022
@nlohmann nlohmann linked an issue Jan 2, 2022 that may be closed by this pull request
How can I use std::string_view as the json_key to "operator []" ? #1529
Closed
@nlohmann
Copy link
Owner Author

nlohmann commented Jan 2, 2022

See #1529 (comment)

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 7254b1f on string_view2 into b69713c on develop.

@falbrechtskirchinger falbrechtskirchinger mentioned this pull request Apr 5, 2022
Merged
@nlohmann nlohmann deleted the string_view2 branch June 18, 2022 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
state: help needed the issue needs help to proceed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

How can I use std::string_view as the json_key to "operator []" ?
2 participants
@nlohmann @coveralls