Simplify source root stripping. #10543
Merged
Conversation
This file contains 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
Previously we had two parallel rule paths for stripped and unstripped source files. This added a lot of complication: various types could contain either stripped or unstripped sources, and there wasn't always an easy way to know which. This also required a lot of near-duplication of code, to handle each of the two paths. This change simplifies the types and rules, as follows: - Unstripped generic sources are represented by the SourceFiles type. - Stripped generic sources are represented by the StrippedSourceFiles type. - Unstripped Python sources are represented by the PythonSourceFiles type, which wraps a SourceFiles. - Stripped Python sources are represented by the StrippedPythonSourceFiles type, which wraps a StrippedSourceFiles. The only way to get a StrippedSourceFiles is to request via a SourceFiles subject. The only way to get a StrippedPythonSourceFiles is to request it via a PythonSourceFiles subject. The SourceFiles type carries just enough extra information to allow source-root stripping even in a merged snapshot, where the originating target information is lost. As a result, other rules operate primarily on unstripped sources, and strip them just as needed. For example, finding ancestor files operates only on unstripped sources, and no longer needs to implement logic to handle the stripped case. [ci skip-rust] [ci skip-build-wheels]
|
It's a non-trivial diff, but the most important parts to focus on are |
Eric-Arellano
approved these changes
Aug 4, 2020
[ci skip-rust] [ci skip-build-wheels]
And fix test. [ci skip-rust] [ci skip-build-wheels]
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.
Previously we had two parallel rule paths for stripped and unstripped source files.
This added a lot of complication: various types could contain either stripped or
unstripped sources, and there wasn't always an easy way to know which. This also
required a lot of near-duplication of code, to handle each of the two paths.
This change simplifies the types and rules, as follows:
which wraps a SourceFiles.
which wraps a StrippedSourceFiles.
The only way to get a StrippedSourceFiles is to request via a SourceFiles subject.
The only way to get a StrippedPythonSourceFiles is to request it via a PythonSourceFiles subject.
The SourceFiles type carries just enough extra information to allow source-root stripping
even in a merged snapshot, where the originating target information is lost.
As a result, other rules operate primarily on unstripped sources, and strip them just as needed.
For example, finding ancestor files operates only on unstripped sources, and no longer needs
to implement logic to handle the stripped case.
[ci skip-rust]
[ci skip-build-wheels]