Skip to content

[6.2][swift-settings] Now that we aren't using it immediately, remove it from tree. #81334

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
May 7, 2025

Conversation

gottesmm
Copy link
Contributor

@gottesmm gottesmm commented May 6, 2025

Explanation: This patch just removes SwiftSettings support from 6.2 since we aren't using it anymore. It also ensures that we do not expose any new ABI as a result of the stdlib part of this feature. If we ever need this we can always get it back from the git history.

Scope: Remove unused code. By removing this we do not expose the code to any users and also ensure that the stdlib part of this feature does not expose any ABI that we would have to maintain indefinitely.

Resolves: rdar://150695113

Main PR: #81306, #81336

Risk: Low. This just reverts a feature that we decided to do a different way. It was not enabled by default and but did expose some ABI which was not relied on by any users.

Testing: N/A

Reviewer: @compnerd

@gottesmm gottesmm requested a review from a team as a code owner May 6, 2025 15:25
@gottesmm
Copy link
Contributor Author

gottesmm commented May 6, 2025

@swift-ci test

DougGregor
DougGregor previously approved these changes May 6, 2025
@DougGregor DougGregor dismissed their stale review May 6, 2025 15:46

Missing template, whoops

@gottesmm
Copy link
Contributor Author

gottesmm commented May 6, 2025

@swift-ci test

gottesmm added 2 commits May 6, 2025 14:12
…rom tree.

We can always get it back from the git history.

rdar://150695113
(cherry picked from commit 9d59dbe)

Conflicts:
	include/swift/AST/DiagnosticsSema.def
	include/swift/Basic/Features.def
	test/abi/macOS/arm64/concurrency.swift
	test/abi/macOS/x86_64/concurrency.swift
I forgot to do this in b34e2d7. This is just to
be careful.

(cherry picked from commit 9ab6a62)

Conflicts:
	lib/Serialization/ModuleFormat.h
@gottesmm gottesmm force-pushed the release/6.2-rdar150695113 branch from 9631eb6 to 741e667 Compare May 6, 2025 21:12
@gottesmm
Copy link
Contributor Author

gottesmm commented May 6, 2025

@swift-ci test

@gottesmm gottesmm enabled auto-merge May 6, 2025 21:13
@gottesmm gottesmm merged commit 322a376 into swiftlang:release/6.2 May 7, 2025
5 checks passed
@gottesmm gottesmm deleted the release/6.2-rdar150695113 branch May 7, 2025 05:43
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