Skip to content

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
merged 6 commits into from
Jun 20, 2024

Conversation

MaxDesiatov
Copy link
Contributor

@MaxDesiatov MaxDesiatov commented Jun 19, 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.

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.
@MaxDesiatov MaxDesiatov added the no functional change No user-visible functional changes included label Jun 19, 2024
@MaxDesiatov MaxDesiatov self-assigned this Jun 19, 2024
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test linux

@MaxDesiatov MaxDesiatov marked this pull request as ready for review June 20, 2024 16:46
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test windows

Copy link
Contributor

@xedin xedin left a comment

Choose a reason for hiding this comment

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

:shipit:

…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
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test windows

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) June 20, 2024 20:26
@MaxDesiatov MaxDesiatov merged commit e13a3aa into main Jun 20, 2024
5 checks passed
@MaxDesiatov MaxDesiatov deleted the maxd/rename-target-to-module branch June 20, 2024 22:47
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
Labels
no functional change No user-visible functional changes included
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants