Skip to content

[Typo] Replace PR#514-525 with one large PR #561

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
merged 1 commit into from
Dec 18, 2015
Merged

[Typo] Replace PR#514-525 with one large PR #561

merged 1 commit into from
Dec 18, 2015

Conversation

practicalswift
Copy link
Contributor

As requested in #526.

@practicalswift
Copy link
Contributor Author

@gottesmm The code is verified passing utils/build-script -RT and the changes suggested above have been made. Please let me know if any further adjustments are needed :-)

@gottesmm
Copy link
Contributor

@benlangmuir I just looked at the first commit.

@gottesmm
Copy link
Contributor

(i.e. the rest of the commits need to be looked at).

@practicalswift
Copy link
Contributor Author

Squashed into a single commit.

@benlangmuir
Copy link
Contributor

@gottesmm I looked at the rest of the changes, which LGTM. My question was about a specific change that you requested (in #501):

This should probably also have its grammar fixed. I would suggest:

// We work around the canonicalization of PolymorphicFunctionType
// by generating a GenericSignature and transforming the input, output
// types.

Do we really want to drop the "FIXME" in this comment?

@gottesmm
Copy link
Contributor

That was not my intention. I just meant the text after the FIXME.

// FIXME: we work around canonicalization of PolymorphicFunctionType
// by generating GenericSignature and transforming the input, output
// We work around the canonicalization of PolymorphicFunctionType
// by generating a GenericSignature and transforming the input, output
Copy link
Contributor

Choose a reason for hiding this comment

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

@practicalswift could you add the FIXME back here (per @gottesmm's clarification), and then re-squash?

@practicalswift
Copy link
Contributor Author

@benlangmuir Re-added FIXME as per @gottesmm's request and re-squashed. Please let me know if any further changes are needed :-)

gribozavr added a commit that referenced this pull request Dec 18, 2015
[Typo] Replace PR#514-525 with one large PR
@gribozavr gribozavr merged commit 6a66b3c into swiftlang:master Dec 18, 2015
freak4pc pushed a commit to freak4pc/swift that referenced this pull request Sep 28, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
[Stress tester XFails] Update XFails
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.

None yet

4 participants