Skip to content
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

Consistently use JSON when encoding output file maps #1777

Merged
merged 1 commit into from
Jan 14, 2025

Conversation

owenv
Copy link
Contributor

@owenv owenv commented Jan 11, 2025

Simplify the encoding of output file maps and remove a yams dependency we don't need in this part of the driver

@owenv owenv requested a review from artemcm January 11, 2025 00:45
@owenv
Copy link
Contributor Author

owenv commented Jan 11, 2025

@swift-ci please test

@jakepetroules jakepetroules self-requested a review January 11, 2025 01:04
@owenv
Copy link
Contributor Author

owenv commented Jan 13, 2025

@swift-ci please test source compatibility

@CodaFi
Copy link
Contributor

CodaFi commented Jan 13, 2025

A heads up this PR is formatted with 4 spaces instead of 2

}
}

private func quoteAndEscape(path: VirtualPath) -> String {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we actually have tests that exercise the quoting and escaping this is doing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a basic unit test for this since existing coverage wasn't great. Also ran this through source compatibility testing and the results look good there so far

@owenv owenv force-pushed the ovoorhees/ofm-json branch 2 times, most recently from a895daa to 8e8af58 Compare January 14, 2025 01:18
@owenv
Copy link
Contributor Author

owenv commented Jan 14, 2025

@swift-ci please test

@owenv
Copy link
Contributor Author

owenv commented Jan 14, 2025

@swift-ci please test Windows platform

@owenv owenv enabled auto-merge January 14, 2025 17:12
@owenv owenv force-pushed the ovoorhees/ofm-json branch from 8e8af58 to c89a585 Compare January 14, 2025 19:17
@owenv
Copy link
Contributor Author

owenv commented Jan 14, 2025

@swift-ci please test

@owenv
Copy link
Contributor Author

owenv commented Jan 14, 2025

@swift-ci please test Windows platform

@owenv owenv merged commit 569b684 into swiftlang:main Jan 14, 2025
3 checks passed
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