Skip to content

Clarify where NSCalendar timezone is set and return values #33

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 5, 2015

Conversation

syoutsey
Copy link
Contributor

@syoutsey syoutsey commented Dec 4, 2015

Flow is more logical and easy to follow by setting timezone immediately after declaration. Additionally, return values more closely follow idioms specified here.

@syoutsey syoutsey changed the title Clarify where timezone is set and return values Clarify where NSCalendar timezone is set and return values Dec 4, 2015
@parkera
Copy link
Contributor

parkera commented Dec 4, 2015

This looks ok, but can you fix up the whitespace and rebase before we merge?

@syoutsey
Copy link
Contributor Author

syoutsey commented Dec 4, 2015

Done, thanks!

@parkera
Copy link
Contributor

parkera commented Dec 4, 2015

Great - just go ahead and rebase this into 1 commit and I'll merge it in. Thanks.

@@ -368,7 +368,9 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
let oldTz = timeZone
Copy link
Contributor

Choose a reason for hiding this comment

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

all these lines could be self.timeZone = timeZone ?? comps.timeZone

Fixed whitespacing issues

Merge timeZone assignment into more clear single operation
@syoutsey
Copy link
Contributor Author

syoutsey commented Dec 4, 2015

@jpsim Great idea, though it looks like the operands are out of order. Fixed and rebased. Thanks!

parkera added a commit that referenced this pull request Dec 5, 2015
Clarify where NSCalendar timezone is set and return values
@parkera parkera merged commit 0bfcd82 into swiftlang:master Dec 5, 2015
@parkera
Copy link
Contributor

parkera commented Dec 5, 2015

Looks good.

atrick pushed a commit to atrick/swift-corelibs-foundation that referenced this pull request Jan 12, 2021
[build] Update xcconfig overrides with workarounds from SR-9292
kateinoigakukun pushed a commit to kateinoigakukun/swift-corelibs-foundation that referenced this pull request Apr 29, 2021
[REPL] Test RPATH is set correctly on linux.
kateinoigakukun pushed a commit to kateinoigakukun/swift-corelibs-foundation that referenced this pull request Oct 11, 2023
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.

3 participants