[expected.unexpected] Rearrange std::unexpected #5360
Merged
+8
−12
Conversation
This file contains 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
This matches the order in [expected.un.ctor].
All the other class templates in <expected> are at the rSec3 level, but std::unexpected is below a mostly useless rSec3 [expected.unexpected]. This subclause has two children, [expected.un.general] which is a single sentence, and [expected.un.object] which defines the class template and its members. If we merge the single sentence from [expected.un.general] into the same subclause as the class synopsis then we can get remove the unnecessary nesting. As a nice side effect, this also gets rid of "object" in the [expected.un.object] stable name, which doesn't really make sense in context.
jensmaurer
approved these changes
Mar 24, 2022
|
@tkoeppe, this looks like an improvement. Do you want to merge that, or should I? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some minor improvements to the
std::unexpectedspec.This is the TOC before:
And after:
In the second image every "Class template foo" under 22.8 is at the same level, without the pointless "Unexpected objects" subclause, and without two "General" subclauses for one simple class template.
The other commit just reorders the
std::unexpectedsynopsis to match the order of the detailed descriptions, and the order of corresponding constructors in thestd::expectedandstd::expected<cv void, E>synopses and details descriptions.