Skip to content

[stdlib] Conditional gardening [NFC] #13191

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 6, 2017
Merged

[stdlib] Conditional gardening [NFC] #13191

merged 1 commit into from
Dec 6, 2017

Conversation

moiseev
Copy link
Contributor

@moiseev moiseev commented Dec 1, 2017

No description provided.

@moiseev moiseev requested a review from airspeedswift December 1, 2017 00:21
@moiseev moiseev changed the title [stdlib] Conditional gardening [stdlib] Conditional gardening [NFC] Dec 1, 2017
@moiseev
Copy link
Contributor Author

moiseev commented Dec 1, 2017

@swift-ci Please smoke test

DougGregor
DougGregor reviewed Dec 1, 2017
View reviewed changes
Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

There are three different indentations for the where in a where clause in this PR.

@moiseev
Copy link
Contributor Author

moiseev commented Dec 1, 2017

@DougGregor yes.

airspeedswift
airspeedswift reviewed Dec 1, 2017
View reviewed changes
stdlib/public/core/Indices.swift Outdated
@available(*, deprecated, renamed: "DefaultIndices")
public typealias DefaultBidirectionalIndices<
T : BidirectionalCollection
> = DefaultIndices<T>
Copy link
Member

Choose a reason for hiding this comment

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

I feel like you're just 80-col-trolling me now...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted. It doesn't make much sense here.

airspeedswift
airspeedswift approved these changes Dec 1, 2017
View reviewed changes
Copy link
Member

@airspeedswift airspeedswift left a comment

Choose a reason for hiding this comment

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

LGTM

@moiseev
Copy link
Contributor Author

moiseev commented Dec 1, 2017

@swift-ci Please smoke test

@moiseev
Copy link
Contributor Author

moiseev commented Dec 1, 2017

@swift-ci Please smoke test and merge

@moiseev
Copy link
Contributor Author

moiseev commented Dec 1, 2017

For the record. The failure is:

--
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:193:23: error: unexpected warning produced: 'DefaultRandomAccessIndices' is deprecated: renamed to 'DefaultIndices'
  typealias Indices = DefaultRandomAccessIndices<CustomRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:193:23: error: unexpected note produced: use 'DefaultIndices' instead
  typealias Indices = DefaultRandomAccessIndices<CustomRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:414:23: error: unexpected warning produced: 'DefaultRandomAccessIndices' is deprecated: renamed to 'DefaultIndices'
  typealias Indices = DefaultRandomAccessIndices<CustomRangeReplaceableRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:414:23: error: unexpected note produced: use 'DefaultIndices' instead
  typealias Indices = DefaultRandomAccessIndices<CustomRangeReplaceableRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:599:23: error: unexpected warning produced: 'DefaultRandomAccessIndices' is deprecated: renamed to 'DefaultIndices'
  typealias Indices = DefaultRandomAccessIndices<CustomMutableRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:599:23: error: unexpected note produced: use 'DefaultIndices' instead
  typealias Indices = DefaultRandomAccessIndices<CustomMutableRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:832:23: error: unexpected warning produced: 'DefaultRandomAccessIndices' is deprecated: renamed to 'DefaultIndices'
  typealias Indices = DefaultRandomAccessIndices<CustomMutableRangeReplaceableRandomAccessButt>
                      ^
/Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-test/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/stdlib/Output/collection-combinatorics.swift.gyb.tmp/collection-combinatorics.swift:832:23: error: unexpected note produced: use 'DefaultIndices' instead
  typealias Indices = DefaultRandomAccessIndices<CustomMutableRangeReplaceableRandomAccessButt>
                      ^

--

DougGregor
DougGregor approved these changes Dec 4, 2017
View reviewed changes
Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

LGTM

@moiseev
Copy link
Contributor Author

moiseev commented Dec 6, 2017

@swift-ci Please test and merge

@moiseev
Copy link
Contributor Author

moiseev commented Dec 6, 2017

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Dec 6, 2017

Build failed
Swift Test Linux Platform
Git Sha - 3a2432f1e804d4f1d71e14a0dda54e8c3689ccaf

@airspeedswift
Copy link
Member

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

swift-ci commented Dec 6, 2017

Build failed
Swift Test OS X Platform
Git Sha - 3a2432f1e804d4f1d71e14a0dda54e8c3689ccaf

@moiseev moiseev merged commit 80940ef into swiftlang:master Dec 6, 2017
@moiseev moiseev deleted the ungybbed branch December 6, 2017 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DougGregor DougGregor DougGregor approved these changes

@airspeedswift airspeedswift airspeedswift approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@moiseev @swift-ci @airspeedswift @DougGregor