Skip to content

Canonicalize swift header files headers and footers #1796

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
Mar 30, 2016

Conversation

danra
Copy link
Contributor

@danra danra commented Mar 22, 2016

What's in this pull request?

Resolved bug number: (SR-)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
OS X platform @swift-ci Please test OS X platform
Linux platform @swift-ci Please test Linux platform

Note: Only members of the Apple organization can trigger swift-ci.

  • Added missing ifdef guard in PointerIntEnum header
  • Consistent naming convention for ifdef guards
  • Consistent 'end namespace swift'
  • Consistent single EOL at end of header files

@@ -57,5 +57,5 @@ demangleTypeAsString(StringRef MangledTypeName,
} // end namespace demangle_wrappers
} // end namespace swift

#endif // LLVM_SWIFT_BASIC_DEMANGLE_WRAPPERS_H
#endif // SWIFT_BASIC_DEMANGLE_WRAPPERS_H
Copy link
Contributor

Choose a reason for hiding this comment

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

I am not sure if you need a '_' in between Demangle and wrappers. I would look in swift/llvm to see what people do. IIRC they don't do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed across all files.

@tkremenek
Copy link
Member

@swift-ci please test

- Added missing ifdef guard in PointerIntEnum header
- Consistent naming convention for ifdef guards
- Consistent 'end namespace swift'
- Consistent single EOL at end of header files
@danra danra force-pushed the swift_basic_sanitize branch from 1506ee8 to 29d76f3 Compare March 23, 2016 07:04
@danra danra changed the title Canonize swift header files headers and footers Canonicalize swift header files headers and footers Mar 26, 2016
@danra
Copy link
Contributor Author

danra commented Mar 29, 2016

@tkremenek Could you please merge this?

@lattner lattner merged commit 821c2cb into swiftlang:master Mar 30, 2016
@danra danra deleted the swift_basic_sanitize branch April 13, 2016 17:32
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