Fix a problem in the logic to generate manifest source from existing parsed manifest structs #3415
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
abertelrud
requested review from
friedbunny,
neonichu and
tomerd
as code owners
|
@swift-ci please smoke test |
abertelrud
added
the
ready
tomerd
approved these changes
Apr 19, 2021
tomerd
reviewed
Apr 19, 2021
tomerd
reviewed
Apr 19, 2021
abertelrud
force-pushed
the
eng/76559428-generated-manifest-version-range-problems
branch
from
6bf809e to
919b2d8
Compare
…ata structures misquoted some package version requirement ranges. This fixes those cases, producing a semantically equivalent package manifests. Since the model does not capture how a particular range was specified, it is not possible to recreate the original shorthands. A future improvement can either extend the model to record the original spelling of the range requirements, or can apply heuristics to shorten the rules in the future (e.g. automatically derive `upToNextMajor()` etc. This also eliminates an extra whitespace before the minimum tools version declaration when the specified tools version allows it, so older parsers can parse the generated manifests. rdar://76559428
abertelrud
force-pushed
the
eng/76559428-generated-manifest-version-range-problems
branch
from
919b2d8 to
1cc2265
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test macos |
1 similar comment
|
@swift-ci please smoke test macos |
abertelrud
deleted the
eng/76559428-generated-manifest-version-range-problems
branch
abertelrud
added a commit
to abertelrud/swift-package-manager
that referenced
this pull request
Apr 21, 2021
…ata structures misquoted some package version requirement ranges. (swiftlang#3415) This fixes those cases, producing a semantically equivalent package manifests. Since the model does not capture how a particular range was specified, it is not possible to recreate the original shorthands. A future improvement can either extend the model to record the original spelling of the range requirements, or can apply heuristics to shorten the rules in the future (e.g. automatically derive `upToNextMajor()` etc. This also eliminates an extra whitespace before the minimum tools version declaration when the specified tools version allows it, so older parsers can parse the generated manifests. rdar://76559428 (cherry picked from commit 8ee8d40)
abertelrud
added a commit
that referenced
this pull request
Apr 21, 2021
…ata structures misquoted some package version requirement ranges. (#3415) (#3422) This fixes those cases, producing a semantically equivalent package manifests. Since the model does not capture how a particular range was specified, it is not possible to recreate the original shorthands. A future improvement can either extend the model to record the original spelling of the range requirements, or can apply heuristics to shorten the rules in the future (e.g. automatically derive `upToNextMajor()` etc. This also eliminates an extra whitespace before the minimum tools version declaration when the specified tools version allows it, so older parsers can parse the generated manifests. rdar://76559428 (cherry picked from commit 8ee8d40)
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.
The logic to generate manifest source from existing parsed manifest data structures misquoted some package version requirement ranges.
Changes
This fixes those cases, producing a semantically equivalent package manifests. Since the model does not capture how a particular range was specified, it is not possible to recreate the original shorthands.
A future improvement can either extend the model to record the original spelling of the range requirements, or can apply heuristics to shorten the rules in the future (e.g. automatically derive
upToNextMajor()etc.This also eliminates an extra whitespace before the minimum tools version declaration when the specified tools version allows it, so older parsers can parse the generated manifests.
rdar://76559428