Skip to content

Conversation

bnbarham
Copy link

@bnbarham bnbarham commented Feb 3, 2024

This has mostly been done, there's just a few left overs (namely LLDB). Leave removing Optional.h and None.h so that this can be merged irrespective of the Swift changes.

@bnbarham bnbarham force-pushed the std-optional-all-the-things branch 2 times, most recently from 4ace404 to a2795c9 Compare February 4, 2024 00:34
@adrian-prantl
Copy link

Nice, did you create the LLDB patch by taking the state of the next branch? Just trying to gauge the chances for merge conflicts here.

@adrian-prantl
Copy link

On closer inspection, the patch is so straightforward it could be done by a sed script, so we're probably fine in regards to conflicts.

@bnbarham
Copy link
Author

bnbarham commented Feb 5, 2024

It was just with sed, yeah. I'm happy to fix the conflicts if there are any.

@bnbarham bnbarham force-pushed the std-optional-all-the-things branch 3 times, most recently from 70a39e4 to 9746805 Compare February 13, 2024 01:32
@bnbarham
Copy link
Author

@swift-ci please test

Copy link

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

LGTM, but please also cherry-pick this to the next branch and then let me know what the diff with llvm.org/main is.

@bnbarham
Copy link
Author

next cherry-pick: #8179

@bnbarham
Copy link
Author

swiftlang/swift#71573

@swift-ci please test

This has mostly been done, there's just a few left overs (namely LLDB).
Leave removing `Optional.h` and `None.h` so that this can be merged
irrespective of the Swift changes.
@bnbarham bnbarham force-pushed the std-optional-all-the-things branch from 9746805 to d05e79d Compare February 14, 2024 17:18
@bnbarham
Copy link
Author

@swift-ci please smoke test

@bnbarham
Copy link
Author

@swift-ci please test

@bnbarham bnbarham merged commit 966aa32 into swiftlang:stable/20230725 Feb 15, 2024
@bnbarham bnbarham deleted the std-optional-all-the-things branch February 15, 2024 05:50
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.

2 participants