Skip to content

Replace stdlib and test/stdlib 9999 availability. #26108

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 2 commits into from
Jul 12, 2019

Conversation

stephentyrone
Copy link
Contributor

macOS 9999 -> macOS 10.15
iOS 9999 -> iOS 13
tvOS 9999 -> tvOS 13
watchOS 9999 -> watchOS 6

Less churn-inducing reworking of #25230

macOS 9999 -> macOS 10.15
iOS 9999 -> iOS 13
tvOS 9999 -> tvOS 13
watchOS 9999 -> watchOS 6
@stephentyrone
Copy link
Contributor Author

stephentyrone commented Jul 12, 2019

Note that this does not include changes to test/*, only test/stdlib/*. There will be a follow-on PR with the remaining test changes. This also does not change the availability for MathFunctions, because we've pended that out of 5.1.

@stephentyrone
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - a8a590a

@stephentyrone
Copy link
Contributor Author

@milseman This is failing on a guard that you added in b19c2cf9c33:

  private init?<S: StringProtocol>(
    _ range: NSRange, _genericIn string: __shared S
  ) {
    // Corresponding stdlib version
    guard #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) else {
      fatalError()
    }
    ...
  }

What is this check actually trying to do? This init is called unconditionally from

  public init?(_ range: NSRange, in string: __shared String) {
    self.init(range, _genericIn: string)
  }

so I don't see how it was ever going to do the right thing.

@stephentyrone stephentyrone requested a review from milseman July 12, 2019 14:57
…d String)

We need this to allow master to work on 10.14 systems (in particular, to allow PR testing to work correctly without disabling back-deployment tests).
@stephentyrone
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - a8a590a

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - a8a590a

Copy link
Member

@milseman milseman left a comment

Choose a reason for hiding this comment

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

LGTM, other than being dead code that we're adding to service an incomplete availability model.

@stephentyrone stephentyrone merged commit dc5915c into swiftlang:master Jul 12, 2019
stephentyrone added a commit to stephentyrone/swift that referenced this pull request Jul 15, 2019
* Replace stdlib and test/stdlib 9999 availability.

macOS 9999 -> macOS 10.15
iOS 9999 -> iOS 13
tvOS 9999 -> tvOS 13
watchOS 9999 -> watchOS 6

* Restore the pre-10.15 version of public init?(_: NSRange, in: __shared String)

We need this to allow master to work on 10.14 systems (in particular, to allow PR testing to work correctly without disabling back-deployment tests).
stephentyrone added a commit that referenced this pull request Jul 16, 2019
* Replace stdlib and test/stdlib 9999 availability.

macOS 9999 -> macOS 10.15
iOS 9999 -> iOS 13
tvOS 9999 -> tvOS 13
watchOS 9999 -> watchOS 6

* Restore the pre-10.15 version of public init?(_: NSRange, in: __shared String)

We need this to allow master to work on 10.14 systems (in particular, to allow PR testing to work correctly without disabling back-deployment tests).
@stephentyrone stephentyrone deleted the stdlib-9999 branch February 8, 2023 00:34
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