-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Fix most "target"/"module" internal naming inconsistencies #7690
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
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cleaning up `PackageGraph` and `Build` code naming inconsistencies after `ResolvedTarget` to `ResolvedModule` renaming. User-visible strings and symbols still reference it as "target", but at least it's easier to navigate internal code. `public` symbols gained deprecation notices where this was possible and easy to add.
@swift-ci test |
@swift-ci test |
@swift-ci test |
@swift-ci test |
@swift-ci test |
@swift-ci test linux |
@swift-ci test windows |
xedin
approved these changes
Jun 20, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…xd/rename-target-to-module # Conflicts: # Sources/PackageGraph/ModulesGraph+Loading.swift # Sources/PackageGraph/Resolution/ResolvedPackage.swift # Sources/PackageModel/Manifest/PackageConditionDescription.swift # Sources/PackageModel/Module/Module.swift # Sources/PackageModel/PackageModel.swift # Sources/PackageModel/Product.swift # Sources/SPMTestSupport/MockWorkspace.swift # Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
@swift-ci test |
@swift-ci test windows |
MaxDesiatov
added a commit
that referenced
this pull request
Jun 27, 2024
Cleaning up `PackageGraph` and `Build` code naming inconsistencies after `ResolvedTarget` to `ResolvedModule` renaming. User-visible strings and symbols still reference it as "target", but at least it's easier to navigate for contributors. `public` symbols gained deprecation notices where this was possible and easy to add. (cherry picked from commit e13a3aa) # Conflicts: # Sources/Build/BuildManifest/LLBuildManifestBuilder.swift # Sources/PackageGraph/ModulesGraph+Loading.swift # Sources/PackageGraph/ModulesGraph.swift # Sources/PackageGraph/Resolution/ResolvedPackage.swift # Sources/PackageLoading/ModuleMapGenerator.swift # Sources/SPMTestSupport/MockBuildTestHelper.swift # Sources/SPMTestSupport/MockWorkspace.swift # Sources/SourceKitLSPAPI/BuildDescription.swift # Tests/BuildTests/ClangTargetBuildDescriptionTests.swift # Tests/WorkspaceTests/WorkspaceTests.swift
MaxDesiatov
added a commit
that referenced
this pull request
Jun 27, 2024
Includes these PRs cherry-picked off `main` * #7605 * #7660 * #7667 * #7682 * #7687 * #7690 * #7684 * #7679 **Explanation**: Cherry-pick of recent NFC changes, which makes it easier to cherry-pick actual bug fixes onto 6.0 due to the reduced number of merge conflicts. **Scope**: broad, includes both modules graph and llbuild-related changes. **Risk**: low, the test suite is passing, no functional changes are included, and cherry-picked changes were incubated on `main` for some time. **Testing**: Existing automated test suite. **Issue**: N/A **Reviewers**: @xedin @MaxDesiatov @rauhul --------- Co-authored-by: Pavel Yaskevich <xedin@apache.org> Co-authored-by: Danny Mösch <danny.moesch@icloud.com> Co-authored-by: Rauhul Varma <rauhul@apple.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleaning up
PackageGraph
andBuild
code naming inconsistencies afterResolvedTarget
toResolvedModule
renaming. User-visible strings and symbols still reference it as "target", but at least it's easier to navigate for contributors.public
symbols gained deprecation notices where this was possible and easy to add.