Skip to content

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

Merged

Conversation

DePasqualeOrg
Copy link
Contributor

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

@tshortli
Copy link
Contributor

tshortli commented Sep 9, 2024

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator

The correct forms in English are "actor-isolated value" (hyphenate compound modifiers preceding nouns) and "is actor isolated" (don't hyphenate predicative compound modifiers).

Note: this accords with the Apple Style Guide.

Comment on lines 868 to 869
// 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.
Copy link
Collaborator

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?

Copy link
Contributor Author

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.

Copy link
Contributor

@xedin xedin left a comment

Choose a reason for hiding this comment

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

LGTM!

@xedin
Copy link
Contributor

xedin commented Sep 12, 2024

@swift-ci please test

@xedin
Copy link
Contributor

xedin commented Sep 12, 2024

cc @gottesmm

@xedin
Copy link
Contributor

xedin commented Sep 13, 2024

@swift-ci please test Windows platform

@DePasqualeOrg
Copy link
Contributor Author

@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?

@AnthonyLatsis
Copy link
Collaborator

We don’t accept merge commits. Could you rebase your branch instead?

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test macOS

@DePasqualeOrg DePasqualeOrg force-pushed the grammar-compound-modifiers branch from 09b3b4b to 77206e6 Compare April 23, 2025 13:19
@AnthonyLatsis
Copy link
Collaborator

Please squash them too.

@DePasqualeOrg DePasqualeOrg force-pushed the grammar-compound-modifiers branch from 77206e6 to c9b1738 Compare April 24, 2025 07:21
@DePasqualeOrg
Copy link
Contributor Author

Okay, I did that. But aren't both of those issues solved if you just do squash on merge?

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test

@AnthonyLatsis AnthonyLatsis merged commit 925b72e into swiftlang:main Apr 25, 2025
3 checks passed
@AnthonyLatsis
Copy link
Collaborator

AnthonyLatsis commented Apr 25, 2025

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants