Skip to content

[stdlib] Remove optional comparison operators (SE-0121) #3637

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
Jul 24, 2016

Conversation

jtbandes
Copy link
Contributor

@jtbandes jtbandes commented Jul 20, 2016

What's in this pull request?

An "implementation" (it's pretty much just deleting code) of SE-0121: removing the versions of <, <=, >, and >= which accept Optional operands.


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
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

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

Lint Testing

Language Comment
Python @swift-ci Please Python lint

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

@CodaFi
Copy link
Contributor

CodaFi commented Jul 21, 2016

Congratulations on the proposal acceptance Jacob!

@swift-ci please test and merge.

@jtbandes
Copy link
Contributor Author

Thanks! I haven't tested this with corelibs-foundation, so may have missed some uses. I guess we'll see :)

@jtbandes
Copy link
Contributor Author

OK, I've created swiftlang/swift-package-manager#515 and swiftlang/swift-corelibs-foundation#459 to remove the few uses of these operators. Once those are merged we can re-run this build.

@jtbandes
Copy link
Contributor Author

@CodaFi Can you re-trigger CI? Assuming it automatically pulls the latest swiftpm and corelibs-foundation, I think the build should work now.

@parkera
Copy link
Contributor

parkera commented Jul 21, 2016

@swift-ci Please test and merge

@jtbandes
Copy link
Contributor Author

OK, another try @parkera, if you don't mind 😄

@gribozavr
Copy link
Contributor

@swift-ci Please test and merge

@gribozavr
Copy link
Contributor

@jtbandes

Foundation/IndexSet.swift:440:31: error: value of optional type 'Element?' not unwrapped; did you mean to use '!' or '?'?
        if range.lowerBound > last || (range.upperBound - 1) < first {

@jtbandes
Copy link
Contributor Author

@gribozavr yep, I made a PR to fix that: swiftlang/swift-corelibs-foundation#464

@moiseev
Copy link
Contributor

moiseev commented Jul 24, 2016

@swift-ci Please test and merge

@jtbandes
Copy link
Contributor Author

@moiseev I think I've fixed the additional test failures. Building/testing locally now.

@gribozavr
Copy link
Contributor

@swift-ci Please test and merge

@jtbandes
Copy link
Contributor Author

Failure looks unrelated:

Command 2: "python" "/home/buildnode/jenkins/workspace/swift-PR-Linux/swift-integration-tests/repl/test-repl-glibc.py" "/home/buildnode/jenkins/workspace/swift-PR-Linux/buildbot_linux/none-swift_package_sandbox_linux-x86_64/usr/bin/swift"
Command 2 Result: 1
Command 2 Output:
None

Command 2 Stderr:
Traceback (most recent call last):
  File "/home/buildnode/jenkins/workspace/swift-PR-Linux/swift-integration-tests/repl/test-repl-glibc.py", line 35, in <module>
    repl.expect('\r\nhello, world.*\r\n')
  File "/usr/lib/python2.7/dist-packages/pexpect/__init__.py", line 1418, in expect
    timeout, searchwindowsize)
  File "/usr/lib/python2.7/dist-packages/pexpect/__init__.py", line 1433, in expect_list
    timeout, searchwindowsize)
  File "/usr/lib/python2.7/dist-packages/pexpect/__init__.py", line 1535, in expect_loop
    raise TIMEOUT(str(err) + '\n' + str(self))
pexpect.TIMEOUT: Timeout exceeded.

@gribozavr gribozavr merged commit 717213c into swiftlang:master Jul 24, 2016
@jtbandes
Copy link
Contributor Author

🎊

@jtbandes jtbandes deleted the se-0121 branch July 24, 2016 21:53
jtbandes added a commit to jtbandes/swift-evolution that referenced this pull request Jul 25, 2016
lattner pushed a commit to swiftlang/swift-evolution that referenced this pull request Jul 25, 2016
abertelrud pushed a commit to abertelrud/swift-evolution that referenced this pull request Jul 29, 2016
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.

5 participants