Skip to content

Re-Sync Options Flags #520

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 1 commit into from
Mar 3, 2021
Merged

Re-Sync Options Flags #520

merged 1 commit into from
Mar 3, 2021

Conversation

CodaFi
Copy link
Contributor

@CodaFi CodaFi commented Mar 3, 2021

Now that cross-module incremental builds are controlled by -{enable,disable}-incremental-imports, resync the options and teach merge-modules to propagate the disable flag.

rdar://74363450

@CodaFi CodaFi requested a review from davidungar March 3, 2021 00:21
@CodaFi CodaFi force-pushed the across-the-universe branch from 3a895ef to e6d948c Compare March 3, 2021 00:23
@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@swift-ci test

@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

Missed some more tests.

@CodaFi CodaFi force-pushed the across-the-universe branch from e6d948c to 256e046 Compare March 3, 2021 00:27
@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@swift-ci test

@CodaFi CodaFi force-pushed the across-the-universe branch from 256e046 to 2990548 Compare March 3, 2021 00:56
@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@swift-ci test macOS

@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@swift-ci test

Copy link
Contributor

@davidungar davidungar left a comment

Choose a reason for hiding this comment

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

Although I've left a few comments about pushing the renaming through further, it would be fine to address those in a subsequent PR. The one part that I'm too concerned about to just Approve this at the moment is that it looks like an invocation like ... -disable... -enable... will be handled incorrectly (i.e. not like the legacy driver where the last argument dominates). But maybe I'm missing something?

Now that cross-module incremental builds are controlled by -{enable,disable}-incremental-imports, resync the options and teach merge-modules to propagate the disable flag.
@CodaFi CodaFi force-pushed the across-the-universe branch from 2990548 to c7d8705 Compare March 3, 2021 17:48
@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@swift-ci test

Comment on lines +68 to +70
if parsedOptions.hasFlag(positive: .disableIncrementalImports,
negative: .enableIncrementalImports,
default: false) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes!

Copy link
Contributor

@davidungar davidungar left a comment

Choose a reason for hiding this comment

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

Looks good! I hope that someday one of us can push the renaming through, but not critical today.

@CodaFi
Copy link
Contributor Author

CodaFi commented Mar 3, 2021

@CodaFi CodaFi merged commit 022df1d into swiftlang:main Mar 3, 2021
@CodaFi CodaFi deleted the across-the-universe branch March 3, 2021 17:59
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.

3 participants