-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Grammatical corrections for compound modifiers #76337
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
Grammatical corrections for compound modifiers #76337
Conversation
@swift-ci please smoke test |
Note: this accords with the Apple Style Guide. |
// code. In the case of a non-actor, we can only have an allocator that is | ||
// global actor isolated, so we will never hit this code path. | ||
// global-actor-isolated, so we will never hit this code path. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this one not a predicate adjective?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I've fixed this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@swift-ci please test |
cc @gottesmm |
@swift-ci please test Windows platform |
@xedin, this PR has been languishing for more than seven months and accumulated conflicts during that time, which I've now resolved. Can we move forward with this so that I don't have to resolve more conflicts in the future? |
We don’t accept merge commits. Could you rebase your branch instead? |
@swift-ci please smoke test macOS |
09b3b4b
to
77206e6
Compare
Please squash them too. |
77206e6
to
c9b1738
Compare
Okay, I did that. But aren't both of those issues solved if you just do squash on merge? |
@swift-ci please smoke test |
Thanks for updating the history. I generally prefer not to squash on merge because then the original commit(s) are nowhere to be found except on GitHub. The occasional preference for the rebase method also makes recovering the right PR from a locally found commit harder in repositories like LLVM that tend to revert and reapply changes multiple times. |
The correct forms in English are "actor-isolated value" (hyphenate compound modifiers preceding nouns) and "is actor isolated" (don't hyphenate predicative compound modifiers).
https://stylemanual.com.au/contents/editing/compound-words/compound-modifiers-including-adjectives-and-adverbs