[lib.intro, iterator.concept.inc, concept.regularinvocable] Avoid "annotation"; hyphenate "freestanding-deleted"#8213
Open
Quuxplusone wants to merge 1 commit into
Open
Conversation
Quuxplusone
force-pushed
the
annotation
branch
from
f59ac53 to
3fc30aa
Compare
jwakely
reviewed
Sep 5, 2025
jwakely
approved these changes
Sep 5, 2025
…notation"; hyphenate "freestanding-deleted" Now that many sections use "annotation" to mean a specific core-language construct, we should avoid using "annotation" to mean anything but that construct, i.e. stop using it to mean "code comment." (There will be an NB comment to this effect.) Drive-by hyphenate "freestanding-deleted function". Not all freestanding-deleted functions are freestanding functions, and not all freestanding-deleted functions are deleted functions; hyphenating helps the reader understand that this is a term of art that cannot meaningfully be broken down into its component notions.
Quuxplusone
force-pushed
the
annotation
branch
from
3fc30aa to
627f830
Compare
jensmaurer
approved these changes
Sep 8, 2025
tkoeppe
added
the
needs rebase
Member
|
Some of these changes have been implemented by #8373 as requested by https://github.com/cplusplus/nbballot/issues/707 Unfortunately, we have a merge conflict now. |
Contributor
Author
|
@eisenwave: "Oops." Note that I was the one who submitted both the NB comment and this PR, and this PR has been sitting approved for two months now — I assume the intent was to use this PR to resolve the matching NB comment. So I suggest the simplest fix is to revert your patch first, and then merge this one, and then mark the NB comment as resolved. However, if you prefer not to revert your patch, then I can rebase this one after this week is over. |
Contributor
|
Yes, please rebase. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Now that many sections use "annotation" to mean a specific core-language construct, we should avoid using "annotation" to mean anything but that construct, i.e. stop using it to mean "code comment." (There will be an NB comment to this effect.)
Drive-by hyphenate "freestanding-deleted function". Not all freestanding-deleted functions are freestanding functions, and not all freestanding-deleted functions are deleted functions; hyphenating helps the reader understand that this is a term of art that cannot meaningfully be broken down into its component notions.